fixes, comments

crates/test-programs/Cargo.toml

@@ -14,18 +14,20 @@ wit-component = "0.9.0"
 heck = "0.4.0"
 
 [dev-dependencies]
+anyhow = { workspace = true }
+tempfile = "3.1.0"
+test-log = { version = "0.2", default-features = false, features = ["trace"] }
+tracing = { workspace = true }
+tracing-subscriber = { version = "0.3.1", default-features = false, features = ['fmt', 'env-filter'] }
+lazy_static = "1"
+wasmtime = { workspace = true, features = ['cranelift', 'component-model'] }
+
 wasi-common = { workspace = true }
 wasi-cap-std-sync = { workspace = true }
-wasmtime = { workspace = true, features = ['cranelift'] }
 wasmtime-wasi = { workspace = true, features = ["tokio"] }
-target-lexicon = { workspace = true }
-tracing-subscriber = { version = "0.3.1", default-features = false, features = ['fmt'] }
-tempfile = "3.1.0"
-os_pipe = "0.9"
-anyhow = { workspace = true }
-wat = { workspace = true }
 cap-std = { workspace = true }
-tokio = { version = "1.8.0", features = ["net", "rt-multi-thread"] }
+tokio = { version = "1.8.0", features = ["net", "rt-multi-thread", "macros"] }
+
 wasmtime-wasi-http = { workspace = true }
 hyper = { version = "1.0.0-rc.3", features = ["full"] }
 http = { version = "0.2.9" }

crates/test-programs/build.rs

@@ -92,7 +92,7 @@ fn modules_rs(meta: &cargo_metadata::Metadata, package: &str, kind: &str, out_di
         format!(
             "
         {decls}\n
-        fn get_module(s: &str) -> wasmtime::Module {{
+        pub fn get_module(s: &str) -> wasmtime::Module {{
             match s {{
                 {cases}
                 _ => panic!(\"no such module: {{}}\", s),
@@ -162,11 +162,11 @@ fn components_rs(
     }
 
     std::fs::write(
-        out_dir.join(&format!("{}_modules.rs", package.to_snake_case())),
+        out_dir.join(&format!("{}_components.rs", package.to_snake_case())),
         format!(
             "
         {decls}\n
-        fn get_component(s: &str) -> wasmtime::component::Component {{
+        pub fn get_component(s: &str) -> wasmtime::component::Component {{
             match s {{
                 {cases}
                 _ => panic!(\"no such component: {{}}\", s),

crates/test-programs/tests/wasi-cap-std-sync.rs

@@ -115,6 +115,9 @@ fn run(name: &str, inherit_stdio: bool) -> Result<()> {
     Ok(())
 }
 
+// Below here is mechanical: there should be one test for every binary in
+// wasi-tests. The only differences should be should_panic annotations for
+// tests which fail.
 #[test_log::test]
 fn big_random_buf() {
     run("big_random_buf", true).unwrap()

crates/test-programs/tests/wasi-tokio.rs

@@ -117,6 +117,9 @@ async fn run(name: &str, inherit_stdio: bool) -> Result<()> {
     Ok(())
 }
 
+// Below here is mechanical: there should be one test for every binary in
+// wasi-tests. The only differences should be should_panic annotations for
+// tests which fail.
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
 async fn big_random_buf() {
     run("big_random_buf", true).await.unwrap()
@@ -239,7 +242,7 @@ async fn path_rename_file_trailing_slashes() {
     run("path_rename_file_trailing_slashes", false)
         .await
         .unwrap()
-}(flavor = "multi_thread", worker_threads = 1)
+}
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
 async fn path_rename() {
     run("path_rename", true).await.unwrap()