fix: cmd with system env var

Author: not-matthias

src/run/runner/tests.rs

@@ -28,6 +28,15 @@ const BENCHMARK_COMMANDS: [&str; 5] = [
     DIRECTORY_CHECK_SCRIPT,
 ];
 
+const ENV_VAR_VALIDATION_SCRIPT: &str = "
+output=$(echo \"$MY_ENV_VAR\")
+if [ \"$output\" != \"Hello\" ]; then
+  echo \"Assertion failed: Expected 'Hello' but got '$output'\"
+  exit 1
+fi";
+
+const ENV_COMMANDS: [(&str, &str, &str); 1] = [("MY_ENV_VAR", "Hello", ENV_VAR_VALIDATION_SCRIPT)];
+
 async fn create_test_setup() -> (SystemInfo, RunData, TempDir) {
     let temp_dir = TempDir::new().unwrap();
 
@@ -93,3 +102,55 @@ async fn test_walltime_executor() {
         }
     }
 }
+
+#[tokio::test]
+async fn test_valgrind_executor_with_env() {
+    let (system_info, run_data, _temp_dir) = create_test_setup().await;
+
+    let executor = ValgrindExecutor;
+    executor.setup(&system_info).await.unwrap();
+
+    let config = Config {
+        mode: RunnerMode::Instrumentation,
+        ..Config::test()
+    };
+    test_executor_with_env(&executor, config, &system_info, &run_data).await;
+}
+
+#[tokio::test]
+async fn test_walltime_executor_with_env() {
+    let (system_info, run_data, _temp_dir) = create_test_setup().await;
+
+    let executor = WallTimeExecutor::new();
+    executor.setup(&system_info).await.unwrap();
+
+    for enable_perf in [false, true] {
+        let config = Config {
+            mode: RunnerMode::Walltime,
+            enable_perf,
+            ..Config::test()
+        };
+
+        test_executor_with_env(&executor, config, &system_info, &run_data).await;
+    }
+}
+
+async fn test_executor_with_env(
+    executor: &dyn Executor,
+    mut config: Config,
+    system_info: &SystemInfo,
+    run_data: &RunData,
+) {
+    for (env_var, env_value, cmd) in ENV_COMMANDS {
+        eprintln!("Running command: {cmd}");
+        config.command = cmd.to_string();
+
+        temp_env::async_with_vars(&[(env_var, Some(env_value))], async {
+            executor
+                .run(&config, system_info, run_data, &None)
+                .await
+                .unwrap();
+        })
+        .await;
+    }
+}

src/run/runner/wall_time/executor.rs

@@ -26,6 +26,11 @@ impl WallTimeExecutor {
     fn walltime_bench_cmd(config: &Config, run_data: &RunData) -> Result<String> {
         let bench_cmd = get_bench_command(config)?;
 
+        // We have to forward all the environment variables.
+        let system_env = std::env::vars()
+            .map(|(env, value)| format!("--setenv={env}=\'{}\'", value.replace("'", "\"")))
+            .join(" ");
+
         let setenv = get_base_injected_env(RunnerMode::Walltime, &run_data.profile_folder)
             .into_iter()
             .map(|(env, value)| format!("--setenv={env}={value}"))