Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/run/runner/helpers/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
7 changes: 0 additions & 7 deletions src/run/runner/valgrind/.setup.rs.pending-snap

This file was deleted.

25 changes: 14 additions & 11 deletions src/run/runner/valgrind/measure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down