Update and refactor how wasi-testsuite is run (#11560)

* Update and refactor how wasi-testsuite is run

This commit updates the `WebAssembly/wasi-testuite` submodule in this
repository which hasn't been updated once in the past 2 years. This then
additionally refactors how tests are run:

* A new top-level test is added at `tests/wasi.rs` similar to
  `tests/wast.rs`.
* The top-level test uses `libtest_mimic` to enable running tests in
  parallel.
* Using `libtest_mimic` enables running a test-at-a-time.
* Using `libtest_mimic` enables seeing a list of failures instead of
  just the first failure.
* Component versions of tests are run in addition to core wasm versions
  of tests.
* Minor updates are made to the adapter and wasmtime-wasi to get some
  tests passing.
* The list of allowed failures is updated with a `FIXME`-per-test of
  what's remaining.

prtest:full

* Fix in-tree tests with new behavior

* Add Windows exemptions

* Fix tests with wasi-common

Author: alexcrichton

Cargo.lock

@@ -380,7 +380,7 @@ glob = "0.3.0"
 libfuzzer-sys = "0.4.8"
 walkdir = "2.3.3"
 cfg-if = "1.0"
-tempfile = "3.1.0"
+tempfile = "3.21.0"
 filecheck = "0.5.0"
 libc = { version = "0.2.112", default-features = true }
 file-per-thread-logger = "0.2.0"
@@ -571,6 +571,10 @@ harness = false
 name = "wast"
 harness = false
 
+[[test]]
+name = "wasi"
+harness = false
+
 [[example]]
 name = "tokio"
 required-features = ["wasi-common/tokio"]

Cargo.toml

@@ -37,12 +37,19 @@ struct Test {
 
 impl Artifacts {
     fn build(&mut self) {
+        let mut generated_code = String::new();
         // Build adapters used below for componentization.
-        let reactor_adapter = self.build_adapter("reactor", &[]);
-        let command_adapter =
-            self.build_adapter("command", &["--no-default-features", "--features=command"]);
-        let proxy_adapter =
-            self.build_adapter("proxy", &["--no-default-features", "--features=proxy"]);
+        let reactor_adapter = self.build_adapter(&mut generated_code, "reactor", &[]);
+        let command_adapter = self.build_adapter(
+            &mut generated_code,
+            "command",
+            &["--no-default-features", "--features=command"],
+        );
+        let proxy_adapter = self.build_adapter(
+            &mut generated_code,
+            "proxy",
+            &["--no-default-features", "--features=proxy"],
+        );
 
         // Build all test programs both in Rust and C/C++.
         let mut tests = Vec::new();
@@ -53,7 +60,6 @@ impl Artifacts {
         // test along with constants pointing to various paths. Note that
         // components are created here as well from core modules.
         let mut kinds = BTreeMap::new();
-        let mut generated_code = String::new();
         let missing_sdk_path =
             PathBuf::from("Asset not compiled, WASI_SDK_PATH missing at compile time");
         for test in tests.iter() {
@@ -175,7 +181,12 @@ impl Artifacts {
     }
 
     // Build the WASI Preview 1 adapter, and get the binary:
-    fn build_adapter(&mut self, name: &str, features: &[&str]) -> Vec<u8> {
+    fn build_adapter(
+        &mut self,
+        generated_code: &mut String,
+        name: &str,
+        features: &[&str],
+    ) -> Vec<u8> {
         let mut cmd = cargo();
         cmd.arg("build")
             .arg("--release")
@@ -202,6 +213,10 @@ impl Artifacts {
         std::fs::copy(&artifact, &adapter).unwrap();
         self.read_deps_of(&artifact);
         println!("wasi {name} adapter: {:?}", &adapter);
+        generated_code.push_str(&format!(
+            "pub const ADAPTER_{}: &'static str = {adapter:?};\n",
+            name.to_shouty_snake_case(),
+        ));
         fs::read(&adapter).unwrap()
     }
 

crates/test-programs/artifacts/build.rs

@@ -91,14 +91,11 @@ unsafe fn test_renumber(dir_fd: wasip1::Fd) {
         "file descriptor range check",
     );
 
-    wasip1::fd_renumber(fd_file3, 127).expect("renumbering FD to 127");
-    match wasip1::fd_renumber(127, u32::MAX) {
-        Err(wasip1::ERRNO_NOMEM) => {
-            // The preview1 adapter cannot handle more than 128 descriptors
-            eprintln!("fd_renumber({fd_file3}, {}) returned NOMEM", u32::MAX)
-        }
-        res => res.expect("renumbering FD to `u32::MAX`"),
-    }
+    assert_eq!(wasip1::fd_renumber(fd_file3, 127), Err(wasip1::ERRNO_BADF));
+    assert_eq!(
+        wasip1::fd_renumber(fd_file3, u32::MAX),
+        Err(wasip1::ERRNO_BADF)
+    );
 
     let fd_file4 = wasip1::path_open(
         dir_fd,

crates/test-programs/src/bin/preview1_renumber.rs

@@ -5,7 +5,8 @@ use test_programs::preview1::{STDERR_FD, STDIN_FD, STDOUT_FD};
 unsafe fn test_stdio() {
     for fd in &[STDIN_FD, STDOUT_FD, STDERR_FD] {
         wasip1::fd_fdstat_get(*fd).expect("fd_fdstat_get on stdio");
-        wasip1::fd_renumber(*fd, *fd + 100).expect("renumbering stdio");
+        assert_eq!(wasip1::fd_renumber(*fd, *fd + 100), Err(wasip1::ERRNO_BADF));
+        wasip1::fd_renumber(*fd, *fd).unwrap();
     }
 }
 

crates/test-programs/src/bin/preview1_stdio.rs

@@ -580,6 +580,9 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
         if !table.contains_key(from) {
             return Err(Error::badf());
         }
+        if !table.contains_key(to) {
+            return Err(Error::badf());
+        }
         table.renumber(from, to)
     }
 

crates/wasi-common/src/snapshots/preview_1.rs

@@ -355,8 +355,13 @@ impl Descriptors {
 
     // Implementation of fd_renumber
     pub fn renumber(&mut self, from_fd: Fd, to_fd: Fd) -> Result<(), Errno> {
-        // First, ensure from_fd is in bounds:
-        let _ = self.get(from_fd)?;
+        // First, ensure to_fd/from_fd is in bounds:
+        if let Descriptor::Closed(_) = self.get(to_fd)? {
+            return Err(wasi::ERRNO_BADF);
+        }
+        if let Descriptor::Closed(_) = self.get(from_fd)? {
+            return Err(wasi::ERRNO_BADF);
+        }
         // Expand table until to_fd is in bounds as well:
         while self.table_len.get() as u32 <= to_fd {
             self.push_closed()?;

crates/wasi-preview1-component-adapter/src/descriptors.rs

@@ -2415,8 +2415,13 @@ pub unsafe extern "C" fn sock_send(
 /// Shut down socket send and receive channels.
 /// Note: This is similar to `shutdown` in POSIX.
 #[unsafe(no_mangle)]
-pub unsafe extern "C" fn sock_shutdown(_fd: Fd, _how: Sdflags) -> Errno {
-    unreachable!()
+pub unsafe extern "C" fn sock_shutdown(fd: Fd, _how: Sdflags) -> Errno {
+    State::with(|state| {
+        state
+            .descriptors_mut()
+            .get_stream_with_error_mut(fd, wasi::ERRNO_BADF)?;
+        Err(wasi::ERRNO_NOTSOCK)
+    })
 }
 
 #[cfg(not(feature = "proxy"))]

crates/wasi-preview1-component-adapter/src/lib.rs

@@ -1468,6 +1468,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiP1Ctx {
         if let types::Filetype::Directory = fs_filetype {
             fs_rights_base &= !types::Rights::FD_SEEK;
             fs_rights_base &= !types::Rights::FD_FILESTAT_SET_SIZE;
+            fs_rights_base &= !types::Rights::PATH_FILESTAT_SET_SIZE;
         }
         if !flags.contains(filesystem::DescriptorFlags::READ) {
             fs_rights_base &= !types::Rights::FD_READ;
@@ -1840,10 +1841,13 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiP1Ctx {
     ) -> Result<(), types::Error> {
         let mut st = self.transact()?;
         let from = from.into();
+        let to = to.into();
+        if !st.descriptors.used.contains_key(&to) {
+            return Err(types::Errno::Badf.into());
+        }
         let btree_map::Entry::Occupied(desc) = st.descriptors.used.entry(from) else {
             return Err(types::Errno::Badf.into());
         };
-        let to = to.into();
         if from != to {
             let desc = desc.remove();
             st.descriptors.free.insert(from);

crates/wasi/src/p1.rs

@@ -3635,6 +3635,12 @@ criteria = "safe-to-deploy"
 delta = "3.16.0 -> 3.19.1"
 notes = "Idiom and platform updates, but nothing major and nothing out of line."
 
+[[audits.tempfile]]
+who = "Alex Crichton <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "3.20.0 -> 3.21.0"
+notes = "Only minor manifest/CI changes."
+
 [[audits.terminal_size]]
 who = "Alex Crichton <[email protected]>"
 criteria = "safe-to-deploy"