difftest: forward use-installed-tools

Author: Firestar99

tests/difftests/bin/Cargo.toml

@@ -6,6 +6,12 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 
+# See rustc_codegen_spirv/Cargo.toml for details on these features
+[features]
+default = ["use-compiled-tools"]
+use-installed-tools = []
+use-compiled-tools = []
+
 [dependencies]
 anyhow = "1.0"
 tracing = "0.1"

tests/difftests/bin/src/main.rs

@@ -78,6 +78,7 @@ fn main() -> Result<()> {
         .current_dir(&base)
         .stderr(std::process::Stdio::inherit())
         .stdout(std::process::Stdio::inherit());
+    runner::forward_features(cmd);
     tracing::debug!("Running cargo command: {:?}", cmd);
 
     let output = cmd.output().expect("build output");

tests/difftests/bin/src/runner.rs

@@ -154,6 +154,7 @@ impl Runner {
                             msg: "Invalid config file path".into(),
                         })?,
                 );
+            forward_features(cmd);
             debug!("Running cargo command: {:?}", cmd);
 
             let output = cmd
@@ -331,6 +332,18 @@ impl Runner {
     }
 }
 
+pub fn forward_features(cmd: &mut Command) {
+    cmd.arg("--features");
+    #[cfg(feature = "use-compiled-tools")]
+    {
+        cmd.arg("difftest/use-compiled-tools");
+    }
+    #[cfg(feature = "use-installed-tools")]
+    {
+        cmd.arg("difftest/use-installed-tools");
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

tests/difftests/lib/Cargo.toml

@@ -8,7 +8,6 @@ repository.workspace = true
 
 # See rustc_codegen_spirv/Cargo.toml for details on these features
 [features]
-default = ["use-compiled-tools"]
 use-installed-tools = [
     "spirv-builder/use-installed-tools"
 ]