Skip to content

Commit bf67d55

Browse files
authored
test: spec test suite cleanup (#313)
1 parent 2b38e5f commit bf67d55

3 files changed

Lines changed: 14 additions & 16 deletions

File tree

crates/tests/build.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ fn is_known_failing(name: &str) -> bool {
1010
"tests_spec_tests_legacy_rethrow_wast"
1111
| "tests_spec_tests_legacy_throw_wast"
1212
| "tests_spec_tests_legacy_try_catch_wast"
13-
| "tests_spec_tests_legacy_try_delegate_wast"
14-
// 64-bit memory/table offsets not yet supported in walrus.
15-
| "tests_spec_tests_data_wast" // active data with non-i32 offset (memory64)
16-
| "tests_spec_tests_elem_wast" // active elem with non-i32 offset (table64)
17-
=> true,
13+
| "tests_spec_tests_legacy_try_delegate_wast" => true,
1814

1915
_ => false,
2016
}

crates/tests/tests/spec-tests.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,22 @@ fn run(wast: &Path) -> Result<(), anyhow::Error> {
2323
.nth(1)
2424
.map(|s| s.to_str().unwrap());
2525

26+
// The custom/ directory contains annotation syntax tests that wasm-tools
27+
// json-from-wast does not yet support.
28+
let in_custom_dir = wast.iter().any(|p| p == "custom");
29+
if in_custom_dir {
30+
return Ok(());
31+
}
32+
2633
let extra_args: &[&str] = match proposal {
2734
None => &[],
28-
Some("annotations") => return Ok(()),
35+
// The threads proposal testsuite has stale assert_invalid cases for
36+
// multiple tables that predate the reference-types proposal.
37+
Some("threads") => return Ok(()),
38+
// custom-descriptors and custom-page-sizes are not yet supported
2939
Some("custom-descriptors") => return Ok(()),
3040
Some("custom-page-sizes") => return Ok(()),
31-
Some("exception-handling") => &[],
32-
Some("extended-const") => &[],
33-
Some("function-references") => &[],
34-
Some("gc") => return Ok(()),
35-
Some("relaxed-simd") => &[],
36-
Some("tail-call") => &[],
37-
Some("threads") => return Ok(()),
38-
Some("wide-arithmetic") => &[],
39-
Some(other) => bail!("unknown wasm proposal: {}", other),
41+
Some(_) => &[],
4042
};
4143

4244
let tempdir = TempDir::new()?;

0 commit comments

Comments
 (0)