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

@@ -72,12 +72,11 @@ fn main() -> Result<()> {
     // We build first to ensure that the tests are compiled before running them and to
     // passthrough stdout and stderr from cargo to help debugging.
     let mut cmd = Command::new("cargo");
-    let cmd = cmd
-        .arg("build")
-        .arg("--release")
-        .current_dir(&base)
-        .stderr(std::process::Stdio::inherit())
-        .stdout(std::process::Stdio::inherit());
+    let cmd = cmd.arg("build").arg("--release");
+    runner::forward_features(cmd);
+    cmd.current_dir(&base)
+        .stderr(process::Stdio::inherit())
+        .stdout(process::Stdio::inherit());
     tracing::debug!("Running cargo command: {:?}", cmd);
 
     let output = cmd.output().expect("build output");

tests/difftests/bin/src/runner.rs

@@ -135,25 +135,22 @@ impl Runner {
             trace!("Config file created at {}", config_file.path().display());
 
             let mut cmd = Command::new("cargo");
-            let cmd = cmd
-                .arg("run")
-                .arg("--release")
-                .arg("--manifest-path")
-                .arg(
-                    manifest_path
-                        .to_str()
-                        .ok_or_else(|| RunnerError::Manifest {
-                            path: manifest_path.clone(),
-                        })?,
-                )
-                .arg(
-                    config_file
-                        .path()
-                        .to_str()
-                        .ok_or_else(|| RunnerError::Config {
-                            msg: "Invalid config file path".into(),
-                        })?,
-                );
+            cmd.arg("run").arg("--release").arg("--manifest-path").arg(
+                manifest_path
+                    .to_str()
+                    .ok_or_else(|| RunnerError::Manifest {
+                        path: manifest_path.clone(),
+                    })?,
+            );
+            forward_features(&mut cmd);
+            cmd.arg("--").arg(
+                config_file
+                    .path()
+                    .to_str()
+                    .ok_or_else(|| RunnerError::Config {
+                        msg: "Invalid config file path".into(),
+                    })?,
+            );
             debug!("Running cargo command: {:?}", cmd);
 
             let output = cmd
@@ -331,6 +328,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"
 ]