diff --git a/src/run/runner/helpers/env.rs b/src/run/runner/helpers/env.rs index f6b3fd9a..e1d5c572 100644 --- a/src/run/runner/helpers/env.rs +++ b/src/run/runner/helpers/env.rs @@ -5,7 +5,6 @@ use lazy_static::lazy_static; lazy_static! { pub static ref BASE_INJECTED_ENV: HashMap<&'static str, String> = { HashMap::from([ - ("PYTHONMALLOC", "malloc".into()), ("PYTHONHASHSEED", "0".into()), ("ARCH", ARCH.into()), ("CODSPEED_ENV", "runner".into()), diff --git a/src/run/runner/valgrind/.setup.rs.pending-snap b/src/run/runner/valgrind/.setup.rs.pending-snap deleted file mode 100644 index 267a3096..00000000 --- a/src/run/runner/valgrind/.setup.rs.pending-snap +++ /dev/null @@ -1,7 +0,0 @@ -{"run_id":"1728893449-688468000","line":184,"new":{"module_name":"codspeed__run__runner__valgrind__setup__tests","snapshot_name":"system_info_to_codspeed_valgrind_version_ubuntu_arm","metadata":{"source":"src/run/runner/valgrind/setup.rs","assertion_line":184,"expression":"get_codspeed_valgrind_filename(&system_info).unwrap()"},"snapshot":"valgrind_3.21.0-0codspeed3_ubuntu-22.04_arm64.deb"},"old":{"module_name":"codspeed__run__runner__valgrind__setup__tests","metadata":{},"snapshot":"valgrind_3.21.0-0codspeed2_ubuntu-22.04_arm64.deb"}} -{"run_id":"1728893449-688468000","line":170,"new":{"module_name":"codspeed__run__runner__valgrind__setup__tests","snapshot_name":"system_info_to_codspeed_valgrind_version_debian","metadata":{"source":"src/run/runner/valgrind/setup.rs","assertion_line":170,"expression":"get_codspeed_valgrind_filename(&system_info).unwrap()"},"snapshot":"valgrind_3.21.0-0codspeed3_ubuntu-20.04_amd64.deb"},"old":{"module_name":"codspeed__run__runner__valgrind__setup__tests","metadata":{},"snapshot":"valgrind_3.21.0-0codspeed2_ubuntu-20.04_amd64.deb"}} -{"run_id":"1728893449-688468000","line":156,"new":{"module_name":"codspeed__run__runner__valgrind__setup__tests","snapshot_name":"system_info_to_codspeed_valgrind_version_ubuntu","metadata":{"source":"src/run/runner/valgrind/setup.rs","assertion_line":156,"expression":"get_codspeed_valgrind_filename(&system_info).unwrap()"},"snapshot":"valgrind_3.21.0-0codspeed3_ubuntu-22.04_amd64.deb"},"old":{"module_name":"codspeed__run__runner__valgrind__setup__tests","metadata":{},"snapshot":"valgrind_3.21.0-0codspeed2_ubuntu-22.04_amd64.deb"}} -{"run_id":"1728893505-912480000","line":184,"new":null,"old":null} -{"run_id":"1728893505-912480000","line":156,"new":null,"old":null} -{"run_id":"1728893505-912480000","line":170,"new":null,"old":null} -{"run_id":"1728893505-912480000","line":198,"new":null,"old":null} diff --git a/src/run/runner/valgrind/measure.rs b/src/run/runner/valgrind/measure.rs index 5ab68f69..697da749 100644 --- a/src/run/runner/valgrind/measure.rs +++ b/src/run/runner/valgrind/measure.rs @@ -50,17 +50,20 @@ pub fn measure( let mut cmd = Command::new("setarch"); cmd.arg(ARCH).arg("-R"); // Configure the environment - cmd.envs(BASE_INJECTED_ENV.iter()).env( - "PATH", - format!( - "{}:{}", - setup_introspected_nodejs() - .map_err(|e| anyhow!("failed to setup NodeJS introspection. {}", e))? - .to_str() - .unwrap(), - env::var("PATH").unwrap_or_default(), - ), - ); + cmd.envs(BASE_INJECTED_ENV.iter()) + .env( + "PATH", + format!( + "{}:{}", + setup_introspected_nodejs() + .map_err(|e| anyhow!("failed to setup NodeJS introspection. {}", e))? + .to_str() + .unwrap(), + env::var("PATH").unwrap_or_default(), + ), + ) + .env("PYTHONMALLOC", "malloc"); + if let Some(cwd) = &config.working_directory { let abs_cwd = canonicalize(cwd)?; cmd.current_dir(abs_cwd);