difftest: unify cargo cmd setup

Author: Firestar99

tests/difftests/bin/src/main.rs

@@ -1,8 +1,5 @@
 use anyhow::Result;
-use std::{
-    env,
-    process::{self, Command},
-};
+use std::{env, process};
 use tester::{
     ColorConfig, DynTestName, OutputFormat, RunIgnored, ShouldPanic, TestDesc, TestDescAndFn,
     TestFn, TestType, run_tests_console,
@@ -11,6 +8,7 @@ use tester::{
 use tracing_subscriber::FmtSubscriber;
 
 mod runner;
+use crate::runner::setup_cargo_cmd;
 use runner::Runner;
 
 fn main() -> Result<()> {
@@ -71,11 +69,8 @@ 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");
-    runner::forward_features(cmd);
-    cmd.current_dir(&base)
-        .stderr(process::Stdio::inherit())
+    let mut cmd = setup_cargo_cmd("build", &base.join("Cargo.toml"))?;
+    cmd.stderr(process::Stdio::inherit())
         .stdout(process::Stdio::inherit());
     tracing::debug!("Running cargo command: {:?}", cmd);
 

tests/difftests/bin/src/runner.rs

@@ -134,15 +134,7 @@ impl Runner {
             write!(config_file, "{}", config_json).map_err(|e| RunnerError::Io { source: e })?;
             trace!("Config file created at {}", config_file.path().display());
 
-            let mut cmd = Command::new("cargo");
-            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);
+            let mut cmd = setup_cargo_cmd("run", &manifest_path)?;
             cmd.arg("--").arg(
                 config_file
                     .path()
@@ -328,6 +320,22 @@ impl Runner {
     }
 }
 
+pub fn setup_cargo_cmd(subcommand: &str, manifest_path: &Path) -> Result<Command, RunnerError> {
+    let mut cmd = Command::new("cargo");
+    cmd.arg(subcommand)
+        .arg("--release")
+        .arg("--manifest-path")
+        .arg(
+            manifest_path
+                .to_str()
+                .ok_or_else(|| RunnerError::Manifest {
+                    path: PathBuf::from(manifest_path),
+                })?,
+        );
+    forward_features(&mut cmd);
+    Ok(cmd)
+}
+
 pub fn forward_features(cmd: &mut Command) {
     cmd.arg("--features");
     #[cfg(feature = "use-compiled-tools")]