A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Refactor WASI testing (#13589)
Alex Crichton168a8eb0ce37
diff --git a/.gitmodules b/.gitmodulesindex 09f95a1a02..96b3d01f98 100644--- a/.gitmodules+++ b/.gitmodules@@ -1,11 +1,8 @@[submodule "tests/spec_testsuite"]path = tests/spec_testsuiteurl = https://github.com/WebAssembly/testsuite-[submodule "tests/wasi_testsuite/wasi-threads"]- path = tests/wasi_testsuite/wasi-threads- url = https://github.com/WebAssembly/wasi-threads-[submodule "tests/wasi_testsuite/wasi-common"]- path = tests/wasi_testsuite/wasi-common+[submodule "tests/wasi-testsuite"]+ path = tests/wasi-testsuiteurl = https://github.com/WebAssembly/wasi-testsuite.gitbranch = prod/testsuite-base[submodule "tests/component-model"]diff --git a/tests/wasi_testsuite/wasi-common b/tests/wasi-testsuitesimilarity index 100%rename from tests/wasi_testsuite/wasi-commonrename to tests/wasi-testsuitediff --git a/tests/wasi.rs b/tests/wasi.rsindex 38116897da..4a4fdc8bf4 100644--- a/tests/wasi.rs+++ b/tests/wasi.rs@@ -104,8 +104,7 @@ fn main() -> Result<()> {let mut trials = Vec::new();if !cfg!(miri) {- find_tests("tests/wasi_testsuite/wasi-common".as_ref(), &mut trials).unwrap();- find_tests("tests/wasi_testsuite/wasi-threads".as_ref(), &mut trials).unwrap();+ find_tests("tests/wasi-testsuite".as_ref(), &mut trials).unwrap();}libtest_mimic::run(&Arguments::from_args(), trials).exit()@@ -131,20 +130,6 @@ fn find_tests(path: &Path, trials: &mut Vec<Trial>) -> Result<()> {move || run_test(&path, false).map_err(|e| format!("{e:?}").into())},));-- // Also test the component version using the wasip1 adapter. Note that- // this is skipped for `wasi-threads` since that's not supported in- // components and it's also skipped for assemblyscript because that- // doesn't support the wasip1 adapter.- if !path.iter().any(|p| p == "wasm32-wasip3")- && !path.iter().any(|p| p == "wasi-threads")- && !path.iter().any(|p| p == "assemblyscript")- {- trials.push(Trial::test(- format!("wasip1 adapter - {}", path.display()),- move || run_test(&path, true).map_err(|e| format!("{e:?}").into()),- ));- }}Ok(())}diff --git a/tests/wasi_testsuite/wasi-threads b/tests/wasi_testsuite/wasi-threadsdeleted file mode 160000index e1893c0045..0000000000--- a/tests/wasi_testsuite/wasi-threads+++ /dev/null@@ -1 +0,0 @@-Subproject commit e1893c00458de3e846f02c9cd2a435992ea8b32c