Add a wast subcommand to the CLI
#2096
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit migrates the `tests/roundtrip.rs` file to a `wast` subcommand of the CLI. This does not actually run tests in terms of executing WebAssembly but it works as a way to parse the test and validate, so everything short of runtime execution and related errors.
With the addition of the `wast` subcommand in the previous commit there's no longer any need to have `tests/local/*`. Additionally it's now much easier to perform per-test configuration since the flags for the test are in the test itself.
Similarly to the previous commit of moving towards `wasm-tools wast` this commit migrates the spec test infrastructure to using this as well. Spec tests are now run by: * A script, `ci/generate-spec-tests.rs`, generates files in `tests/cli/spec/*.wast` to run each spec test. * Each test lists the features needed to be enabled for the test to run. * The tests are then naturally run during the `--test cli` test suite run. New automation is added to ensure that the version in-tree is up-to-date to ensure we don't creep in too many files by accident.
No longer needed!
|
I still want to put some finishing touches on this in terms of documentation, but in terms of review it should otherwise be good to go |
|
documented now 👍 |
fitzgen
approved these changes
Mar 12, 2025
Comment on lines
+90
to
+97
| macro_rules! adjust { | ||
| ($e:expr) => {{ | ||
| let mut e = wast::Error::from($e); | ||
| e.set_path(test); | ||
| e.set_text(contents); | ||
| e | ||
| }}; | ||
| } |
There was a problem hiding this comment.
This seems like it could just be a closure, and doesn't actually need to be a macro?
There was a problem hiding this comment.
Oh I guess because it is generic over the type of $e it can't be a closure. blech.
You mean where you run one test, set |
This was referenced Mar 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I was duly inspired by #2093 to not only add such a subcommand but also restructure the test suite. I've long felt that the current test suite is a bit of a pain especially around per-test configuration since right now it's all configured in
tests/roundtrip.rsand it's also not obvious how much configuration applies to each test. With the concept of awastsubcomand I realized that we could migrate all tests totests/cli/*which easily afforts per-test configuration, yay!This commit thusly migrates
tests/roundtrip.rstowasm-tools wastand then moves all tests into thetests/cli/*directory. Tests aren't really cleaned up at this time but it should be much easier in the future to clean things up as needed.