Add Support for cargo nextest

.github/workflows/main.yml

@@ -144,6 +144,9 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: '20'
+    - uses: denoland/setup-deno@v1
+      with:
+        deno-version: v1.x
     - run: cargo test
     - run: cargo test -p wasm-bindgen-cli-support
     - run: cargo test -p wasm-bindgen-cli

Cargo.toml

@@ -55,6 +55,13 @@ serde_derive = "1.0"
 wasm-bindgen-test-crate-a = { path = 'tests/crates/a', version = '0.1' }
 wasm-bindgen-test-crate-b = { path = 'tests/crates/b', version = '0.1' }
 
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+assert_cmd = "1.0"
+lazy_static = "1.4.0"
+predicates = "1.0.0"
+rand = "0.8.5"
+regex = "1.10.4"
+
 [workspace]
 members = [
   "benchmarks",

crates/cli-support/src/js/mod.rs

@@ -345,7 +345,8 @@ impl<'a> Context<'a> {
             }}
 
             const wasmInstance = (await WebAssembly.instantiate(wasmCode, imports)).instance;
-            const wasm = wasmInstance.exports;",
+            const wasm = wasmInstance.exports;
+            export const __wasm = wasm;",
             module_name = module_name
         )
     }

crates/cli/Cargo.toml

@@ -20,6 +20,7 @@ pkg-url = "https://github.com/rustwasm/wasm-bindgen/releases/download/{ version
 bin-dir = "wasm-bindgen-{ version }-{ target }/{ bin }{ binary-ext }"
 
 [dependencies]
+clap = { version = "4.5", features = ["derive"] }
 docopt = "1.0"
 env_logger = "0.8"
 anyhow = "1.0"
@@ -40,8 +41,11 @@ wasm-bindgen-shared = { path = "../shared", version = "=0.2.92" }
 [dev-dependencies]
 assert_cmd = "1.0"
 diff = "0.1"
+lazy_static = "1.4.0"
 predicates = "1.0.0"
+rand = "0.8.5"
 rayon = "1.0"
+regex = "1.10.4"
 tempfile = "3.0"
 wasmparser = "0.102.0"
 wasmprinter = "0.2.54"

crates/cli/src/bin/wasm-bindgen-test-runner/cli/args.rs

@@ -0,0 +1,25 @@
+use super::ListArgs;
+use super::RunArgs;
+use clap::Parser;
+use std::path::PathBuf;
+
+#[derive(Parser, Debug)]
+// It would be better to use the default version, but it returns wasm-bindgen-cli instead of wasm-bindgen-test-runner
+#[command(about = "Execute all wasm bindgen unit and integration tests and build examples of a local package", version = None, long_about = None)]
+#[command(
+    after_help = "Additional documentation: https://rustwasm.github.io/wasm-bindgen/wasm-bindgen-test/usage.html"
+)]
+pub struct Args {
+    /// The wasm file to test
+    pub input: Option<PathBuf>,
+
+    #[command(flatten)]
+    pub run: RunArgs,
+
+    #[command(flatten)]
+    pub list: ListArgs,
+
+    /// Print version
+    #[arg(short = 'V', long)]
+    pub version: bool,
+}

crates/cli/src/bin/wasm-bindgen-test-runner/cli/list_args.rs

@@ -0,0 +1,16 @@
+use clap::Args;
+
+#[derive(Args, Debug)]
+pub struct ListArgs {
+    /// List all tests that would be run
+    #[arg(long)]
+    pub list: bool,
+
+    /// Format of the tests listing output
+    #[arg(long, value_name = "FORMAT", value_parser = ["terse", "json"])]
+    pub format: Option<String>,
+
+    /// Restricts the listing to only consider the ignored tests
+    #[arg(long)]
+    pub ignored: bool,
+}

crates/cli/src/bin/wasm-bindgen-test-runner/cli/mod.rs

@@ -0,0 +1,7 @@
+mod args;
+mod list_args;
+mod run_args;
+
+pub use args::Args;
+pub use list_args::ListArgs;
+pub use run_args::RunArgs;

crates/cli/src/bin/wasm-bindgen-test-runner/cli/run_args.rs

@@ -0,0 +1,52 @@
+use clap::Args;
+
+#[derive(Args, Debug)]
+pub struct RunArgs {
+    /// If specified, only executes the tests containing [testname] in their names
+    pub testname: Option<String>,
+
+    /// Run only the test with the exact name
+    #[arg(long)]
+    pub exact: bool,
+
+    /// Include ignored tests in the test run
+    #[arg(long)]
+    pub include_ignored: bool,
+
+    /// Disables the tests output capture
+    #[arg(long)]
+    pub nocapture: bool,
+
+    /// Skip tests whose names match the given pattern
+    #[arg(long, value_name = "PATTERN", num_args = 0..)]
+    pub skip: Vec<String>,
+}
+
+impl RunArgs {
+    pub fn to_args(&self) -> Vec<&str> {
+        let mut args = Vec::<&str>::new();
+
+        if let Some(testname) = &self.testname {
+            args.push(testname);
+        }
+
+        if self.exact {
+            args.push("--exact");
+        }
+
+        if self.include_ignored {
+            args.push("--include-ignored");
+        }
+
+        if self.nocapture {
+            args.push("--nocapture");
+        }
+
+        for skip in &self.skip {
+            args.push("--skip");
+            args.push(skip);
+        }
+
+        args
+    }
+}

crates/cli/src/bin/wasm-bindgen-test-runner/commands/list.rs

@@ -0,0 +1,26 @@
+use anyhow::Result;
+use walrus::Module;
+
+pub fn list(wasm: &Module, ignored: bool) -> Result<()> {
+    for export in wasm.exports.iter() {
+        if !export.name.starts_with("__wbgt_") {
+            continue;
+        }
+
+        let parts: Vec<&str> = export.name.split('$').collect();
+
+        if ignored {
+            if parts.len() == 3 {
+                let test = parts[1];
+                let test = &test[test.find("::").unwrap_or(0) + 2..];
+                println!("{}: test", test);
+            }
+        } else {
+            let test = parts[1];
+            let test = &test[test.find("::").unwrap_or(0) + 2..];
+            println!("{}: test", test);
+        }
+    }
+
+    return Ok(());
+}

crates/cli/src/bin/wasm-bindgen-test-runner/commands/mod.rs

@@ -0,0 +1,5 @@
+mod list;
+mod version;
+
+pub use list::list;
+pub use version::version;

crates/cli/src/bin/wasm-bindgen-test-runner/commands/version.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn version() -> Result<()> {
+    println!(
+        "wasm-bindgen-test-runner {}",
+        wasm_bindgen_shared::version()
+    );
+    return Ok(());
+}

crates/cli/src/bin/wasm-bindgen-test-runner/deno.rs

@@ -1,4 +1,3 @@
-use std::ffi::OsString;
 use std::fs;
 use std::path::Path;
 use std::process::Command;
@@ -7,27 +6,19 @@ use anyhow::{Context, Error};
 
 use crate::node::{exec, SHARED_SETUP};
 
-pub fn execute(
-    module: &str,
-    tmpdir: &Path,
-    args: &[OsString],
-    tests: &[String],
-) -> Result<(), Error> {
+pub fn execute(module: &str, tmpdir: &Path, args: &[&str], tests: &[String]) -> Result<(), Error> {
     let mut js_to_execute = format!(
         r#"import * as wasm from "./{0}.js";
 
         {console_override}
 
-        // global.__wbg_test_invoke = f => f();
+        window.__wbg_test_invoke = f => f();
 
         // Forward runtime arguments. These arguments are also arguments to the
         // `wasm-bindgen-test-runner` which forwards them to deno which we
         // forward to the test harness. this is basically only used for test
         // filters for now.
-        cx.args(Deno.args.slice(1));
-
-        const ok = await cx.run(tests.map(n => wasm.__wasm[n]));
-        if (!ok) Deno.exit(1);
+        cx.args(Deno.args);
 
         const tests = [];
     "#,
@@ -39,6 +30,11 @@ pub fn execute(
         js_to_execute.push_str(&format!("tests.push('{}')\n", test));
     }
 
+    js_to_execute.push_str(
+        r#"const ok = await cx.run(tests.map(n => wasm.__wasm[n]));
+if (!ok) Deno.exit(1);"#,
+    );
+
     let js_path = tmpdir.join("run.js");
     fs::write(&js_path, js_to_execute).context("failed to write JS file")?;