Test both --stubs=embedded and --stubs=separate

Author: EugenDueck

crates/test/src/c.rs

@@ -68,6 +68,7 @@ impl LanguageMethods for C {
 
     fn codegen_test_variants(&self) -> &[(&str, &[&str])] {
         &[
+            ("base", &[]),
             ("no-sig-flattening", &["--no-sig-flattening"]),
             ("autodrop", &["--autodrop-borrows=yes"]),
             ("async", &["--async=all"]),

crates/test/src/csharp.rs

@@ -30,8 +30,8 @@ impl LanguageMethods for Csharp {
         &["--runtime=native-aot"]
     }
 
-    fn default_bindgen_args_for_codegen(&self) -> &[&str] {
-        &["--generate-stub"]
+    fn codegen_test_variants(&self) -> &[(&str, &[&str])] {
+        &[("base", &["--generate-stub"])]
     }
 
     fn should_fail_verify(

crates/test/src/lib.rs

@@ -214,6 +214,7 @@ struct Verify<'a> {
     bindings_dir: &'a Path,
     artifacts_dir: &'a Path,
     args: &'a [String],
+    args_kind: &'a str,
     world: &'a str,
 }
 
@@ -503,21 +504,9 @@ impl Runner<'_> {
                     continue;
                 }
 
-                let mut args = Vec::new();
-                for arg in language.obj().default_bindgen_args_for_codegen() {
-                    args.push(arg.to_string());
-                }
-
-                codegen_tests.push((
-                    language.clone(),
-                    test,
-                    name.to_string(),
-                    args.clone(),
-                    config.clone(),
-                ));
-
                 for (args_kind, new_args) in language.obj().codegen_test_variants() {
                     let mut args = args.clone();
+                    let mut args = Vec::new();
                     for arg in new_args.iter() {
                         args.push(arg.to_string());
                     }
@@ -615,6 +604,7 @@ impl Runner<'_> {
                     bindings_dir: &bindings_dir,
                     wit_test: test,
                     args: &bindgen.args,
+                    args_kind,
                 },
             )
             .context("failed to verify generated bindings")?;
@@ -1107,16 +1097,15 @@ trait LanguageMethods {
     /// `//@` for Rust or `;;@` for WebAssembly Text.
     fn comment_prefix_for_test_config(&self) -> Option<&str>;
 
-    /// Returns the extra permutations, if any, of arguments to use with codegen
-    /// tests.
+    /// Returns all test permutations of arguments to use with codegen tests.
     ///
     /// This is used to run all codegen tests with a variety of bindings
     /// generator options. The first element in the tuple is a descriptive
-    /// string that should be unique (used in file names) and the second elemtn
+    /// string that should be unique (used in file names) and the second element
     /// is the list of arguments for that variant to pass to the bindings
     /// generator.
     fn codegen_test_variants(&self) -> &[(&str, &[&str])] {
-        &[]
+        &[("base", &[])]
     }
 
     /// Performs any one-time preparation necessary for this language, such as
@@ -1174,12 +1163,6 @@ trait LanguageMethods {
         &[]
     }
 
-    /// Same as `default_bindgen_args` but specifically applied during codegen
-    /// tests, such as generating stub impls by default.
-    fn default_bindgen_args_for_codegen(&self) -> &[&str] {
-        &[]
-    }
-
     /// Returns the name of this bindings generator when passed to
     /// `wit-bindgen`.
     ///

crates/test/src/rust.rs

@@ -45,8 +45,6 @@ struct RustConfig {
     externs: Vec<String>,
 }
 
-const STUB_SEPARATE: bool = false;
-
 impl LanguageMethods for Rust {
     fn display(&self) -> &str {
         "rust"
@@ -69,7 +67,7 @@ impl LanguageMethods for Rust {
 
         // Currently there's a bug with this borrowing mode which means that
         // this variant does not pass.
-        if name == "wasi-http-borrowed-duplicate" {
+        if name.starts_with("wasi-http-borrowed-duplicate") {
             return true;
         }
 
@@ -78,28 +76,42 @@ impl LanguageMethods for Rust {
 
     fn codegen_test_variants(&self) -> &[(&str, &[&str])] {
         &[
-            ("borrowed", &["--ownership=borrowing"]),
+            // embedded stubs
+            ("base", &["--stubs=embedded"]),
+            ("borrowed", &["--stubs=embedded", "--ownership=borrowing"]),
             (
                 "borrowed-duplicate",
-                &["--ownership=borrowing-duplicate-if-necessary"],
+                &[
+                    "--stubs=embedded",
+                    "--ownership=borrowing-duplicate-if-necessary",
+                ],
+            ),
+            ("async", &["--stubs=embedded", "--async=all"]),
+            ("no-std", &["--stubs=embedded", "--std-feature"]),
+            // separate stubs
+            (
+                "separate-stubs",
+                &["--stubs=separate", "--ownership=borrowing"],
+            ),
+            (
+                "borrowed-duplicate-separate-stubs",
+                &[
+                    "--stubs=separate",
+                    "--ownership=borrowing-duplicate-if-necessary",
+                ],
+            ),
+            ("async-separate-stubs", &["--stubs=separate", "--async=all"]),
+            (
+                "no-std-separate-stubs",
+                &["--stubs=separate", "--std-feature"],
             ),
-            ("async", &["--async=all"]),
-            ("no-std", &["--std-feature"]),
         ]
     }
 
     fn default_bindgen_args(&self) -> &[&str] {
         &["--generate-all", "--format"]
     }
 
-    fn default_bindgen_args_for_codegen(&self) -> &[&str] {
-        if STUB_SEPARATE {
-            &["--stubs", "separate"]
-        } else {
-            &["--stubs", "embedded"]
-        }
-    }
-
     fn prepare(&self, runner: &mut Runner<'_>) -> Result<()> {
         let cwd = env::current_dir()?;
         let opts = &runner.opts.rust;
@@ -237,7 +249,11 @@ path = 'lib.rs'
         let bindings = verify.bindings_dir.join(format!(
             "{}{}.rs",
             verify.world.to_snake_case(),
-            if STUB_SEPARATE { "_impl" } else { "" },
+            if verify.args_kind.ends_with("separate-stubs") {
+                "_impl"
+            } else {
+                ""
+            },
         ));
         let test_edition = |edition: Edition| -> Result<()> {
             let mut cmd = runner.rustc(edition);