Forward env vars to executable

Author: oli-obk

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * `OutputConflictHandling` has been replaced by `error_on_output_conflict`, `bless_output_files`,
     and `ignore_output_conflict` functions. Custom functions can now be used to implement special
     handling of output conflicts.
+* `Run` now forwards env vars passed to the compiler to the executable, too
 
 ### Removed
 

src/custom_flags/run.rs

@@ -2,11 +2,11 @@
 
 use bstr::ByteSlice;
 use spanned::Spanned;
-use std::process::{Command, Output};
+use std::{path::Path, process::Output};
 
 use crate::{
     build_manager::BuildManager, display, per_test_config::TestConfig,
-    status_emitter::RevisionStyle, Error, Errored, TestOk, TestRun,
+    status_emitter::RevisionStyle, CommandBuilder, Error, Errored, TestOk, TestRun,
 };
 
 use super::Flag;
@@ -35,7 +35,7 @@ impl Flag for Run {
         let mut cmd = config.build_command(build_manager)?;
         let exit_code = self.exit_code;
         let revision = config.extension("run");
-        let config = TestConfig {
+        let mut config = TestConfig {
             config: config.config.clone(),
             comments: config.comments.clone(),
             aux_dir: config.aux_dir.clone(),
@@ -57,18 +57,25 @@ impl Flag for Run {
             let file = files.next().unwrap();
             assert_eq!(files.next(), None);
             let file = std::str::from_utf8(file).unwrap();
-            let exe_file = config.config.out_dir.join(file);
-            let mut exe = Command::new(&exe_file);
+            let mut envs = std::mem::take(&mut config.config.program.envs);
+            config.config.program = CommandBuilder::cmd(config.config.out_dir.join(file));
+            envs.extend(config.envs().map(|(k, v)| (k.into(), Some(v.into()))));
+            config.config.program.envs = envs;
+
+            let mut exe = config.config.program.build(Path::new(""));
             let stdin = config
                 .status
                 .path()
                 .with_extension(format!("{revision}.stdin"));
             if stdin.exists() {
                 exe.stdin(std::fs::File::open(stdin).unwrap());
             }
-            let output = exe
-                .output()
-                .unwrap_or_else(|err| panic!("exe file: {}: {err}", display(&exe_file)));
+            let output = exe.output().unwrap_or_else(|err| {
+                panic!(
+                    "exe file: {}: {err}",
+                    display(&config.config.program.program)
+                )
+            });
 
             if config.aborted() {
                 return TestRun {

src/per_test_config.rs

@@ -153,14 +153,7 @@ impl TestConfig {
             }
         }
 
-        // False positive in miri, our `map` uses a ref pattern to get the references to the tuple fields instead
-        // of a reference to a tuple
-        #[allow(clippy::map_identity)]
-        cmd.envs(
-            self.comments()
-                .flat_map(|r| r.env_vars.iter())
-                .map(|(k, v)| (k, v)),
-        );
+        cmd.envs(self.envs());
 
         Ok(cmd)
     }
@@ -426,4 +419,11 @@ impl TestConfig {
     pub(crate) fn aborted(&self) -> bool {
         self.config.aborted()
     }
+
+    /// All the environment variables set for the given revision
+    pub fn envs(&self) -> impl Iterator<Item = (&str, &str)> {
+        self.comments()
+            .flat_map(|r| r.env_vars.iter())
+            .map(|(k, v)| (k.as_ref(), v.as_ref()))
+    }
 }