Skip to content

[test] Tweak RUN commands of test/lit/basic/ #6159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2023

Conversation

aheejin
Copy link
Member

@aheejin aheejin commented Dec 8, 2023

This tweaks generated file names and filecheck prefixes to be more (IMHO) consistent. Also shortened binary/BINARY to bin/BIN for conciseness. This also changes the order of RUN commands a little.

And this changes

wasm-opt %t.wast -all -o %t.text.wast -g -S

to

wasm-opt %s -all -o %t.text.wast -g -S

The current command doesn't take the source file but the generated file from the command above wasm-dis, which is not the behavior of check.py. This changes it back to the original source (%s).

As a result of wasm-opt change, some tests are now failing because of the order of (type)s. So I just deleted all CHECK lines and regenerated them using update_lit_checks.py --all-items. The large amount of CHECK line changes are mainly because I moved CHECK-TEXT before CHECK-BINARY and not meaningful.

This tweaks generated file names and `filecheck` prefixes to be more
(IMHO) consistent. Also shortened binary/BINARY to bin/BIN for
conciseness. This also changes the order of `RUN` commands a little.

And this changes
```console
wasm-opt %t.wast -all -o %t.text.wast -g -S
```
to
```console
wasm-opt %s -all -o %t.text.wast -g -S
```
The current command doesn't take the source file but the generated file
from the command above `wasm-dis`, which is not the behavior of
`check.py`. This changes it back to the original source (`%s`).

As a result of `wasm-opt` change, some tests are now failing because of
the order of `(type)`s. So I just deleted all `CHECK` lines and
regenerated them using `update_lit_checks.py --all-items`. The large
amount of `CHECK` line changes are mainly because I moved `CHECK-TEXT`
before `CHECK-BINARY` and not meaningful.
@aheejin aheejin requested review from kripken and tlively December 8, 2023 23:06
aheejin added a commit to aheejin/binaryen that referenced this pull request Dec 8, 2023
This ports all tests from `test/` to `test/lit/basic/`. The set of
commands and `CHECK` lines used are the same as the ones in WebAssembly#6159. Now
we use `lit` to test these, this also deletes all `.wast`,
`.wast.from-wast`, `.wast.fromBinary`, and
`.wast.fromBinary.noDebugInfo` files from `test/`.

All tests lines are generated by `update_lit_checks.py --all-items`.

This also deletes these three multi-memory tests in `test/lit/`, because
they seem to contain the same code with the ones in `test/`, which have
been ported to `test/lit/basic/` along with other tests.
- `test/lit/multi-memories-atomics64.wast`
- `test/lit/multi-memories-basics.wast`
- `test/lit/multi-memories-simd.wast`

This also adds newlines between `(func`s in case there are none, to make
`CHECK` lines easy to view and removes some extra existing newlines here
and there.
@aheejin aheejin merged commit 5db8eb2 into WebAssembly:main Dec 12, 2023
@aheejin aheejin deleted the basic_test_command branch December 12, 2023 01:41
aheejin added a commit that referenced this pull request Dec 13, 2023
This ports all tests from `test/` to `test/lit/basic/`. The set of
commands and `CHECK` lines used are the same as the ones in #6159. Now
 we use `lit` to test these, this also deletes all `.wast`,
`.wast.from-wast`, `.wast.fromBinary`, and
`.wast.fromBinary.noDebugInfo` files from `test/` and all related test
routines from the python scripts.

All `CHECK` lines are generated by `update_lit_checks.py --all-items`.

This also deletes these three multi-memory tests in `test/lit/`, because
they seem to contain the same code with the ones in `test/`, which have
been ported to `test/lit/basic/` along with other tests.
- `test/lit/multi-memories-atomics64.wast`
- `test/lit/multi-memories-basics.wast`
- `test/lit/multi-memories-simd.wast`

This also adds newlines between `(func`s in case there are none to make
`CHECK` lines easy to view, and removes some extra existing newlines
here and there.
radekdoulik pushed a commit to dotnet/binaryen that referenced this pull request Jul 12, 2024
This tweaks generated file names and `filecheck` prefixes to be more
(IMHO) consistent. Also shortened binary/BINARY to bin/BIN for
conciseness. This also changes the order of `RUN` commands a little.

And this changes
```console
wasm-opt %t.wast -all -o %t.text.wast -g -S
```
to
```console
wasm-opt %s -all -o %t.text.wast -g -S
```
The current command doesn't take the source file but the generated file
from the command above `wasm-dis`, which is not the behavior of
`check.py`. This changes it back to the original source (`%s`).

As a result of `wasm-opt` change, some tests are now failing because of
the order of `(type)`s. So I just deleted all `CHECK` lines and
regenerated them using `update_lit_checks.py --all-items`. The large
amount of `CHECK` line changes are mainly because I moved `CHECK-TEXT`
before `CHECK-BINARY` and not meaningful.
radekdoulik pushed a commit to dotnet/binaryen that referenced this pull request Jul 12, 2024
This ports all tests from `test/` to `test/lit/basic/`. The set of
commands and `CHECK` lines used are the same as the ones in WebAssembly#6159. Now
 we use `lit` to test these, this also deletes all `.wast`,
`.wast.from-wast`, `.wast.fromBinary`, and
`.wast.fromBinary.noDebugInfo` files from `test/` and all related test
routines from the python scripts.

All `CHECK` lines are generated by `update_lit_checks.py --all-items`.

This also deletes these three multi-memory tests in `test/lit/`, because
they seem to contain the same code with the ones in `test/`, which have
been ported to `test/lit/basic/` along with other tests.
- `test/lit/multi-memories-atomics64.wast`
- `test/lit/multi-memories-basics.wast`
- `test/lit/multi-memories-simd.wast`

This also adds newlines between `(func`s in case there are none to make
`CHECK` lines easy to view, and removes some extra existing newlines
here and there.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants