feat(runner): improve error handling for valgrind

Signed-off-by: not-matthias <matthias@codspeed.io>

Author: not-matthias

src/run/runner/valgrind/measure.rs

@@ -9,6 +9,7 @@ use crate::run::{config::Config, instruments::mongo_tracer::MongoTracer};
 use lazy_static::lazy_static;
 use std::env;
 use std::fs::canonicalize;
+use std::io::Read;
 use std::path::Path;
 use std::{env::consts::ARCH, process::Command};
 
@@ -85,8 +86,18 @@ pub fn measure(
         .arg(format!("--callgrind-out-file={}", profile_path.to_str().unwrap()).as_str())
         .arg(format!("--log-file={}", log_path.to_str().unwrap()).as_str());
 
-    // Set the command to execute
-    cmd.args(["sh", "-c", get_bench_command(config)?.as_str()]);
+    // The command is wrapped in a shell script, which executes it in a
+    // subprocess and then writes the exit code to a file. The process will
+    // always exit with status code 0, unless valgrind fails.
+    let mut cmd_status_file = tempfile::NamedTempFile::new()?;
+    let run_cmd = format!(
+        "(eval \"{}\"); echo \"$?\" > \"{}\"",
+        get_bench_command(config)?,
+        cmd_status_file.path().display()
+    );
+
+    // Set the command to execute:
+    cmd.args(["sh", "-c", run_cmd.as_str()]);
 
     // TODO: refactor and move this to the `Instruments` struct
     if let Some(mongo_tracer) = mongo_tracer {
@@ -96,7 +107,30 @@ pub fn measure(
     debug!("cmd: {:?}", cmd);
     let status = run_command_with_log_pipe(cmd)
         .map_err(|e| anyhow!("failed to execute the benchmark process. {}", e))?;
+    let cmd_status = {
+        let mut content = String::new();
+        cmd_status_file.read_to_string(&mut content)?;
+
+        content.parse::<u32>().unwrap_or(1)
+    };
+
+    debug!(
+        "Valgrind exit code = {:?}, Program exit code = {}",
+        status.code(),
+        cmd_status
+    );
+
+    // Check the valgrind exit code
     if !status.success() {
+        let valgrind_log = profile_folder.join("valgrind.log");
+        let valgrind_log = std::fs::read_to_string(&valgrind_log).unwrap_or_default();
+        debug!("valgrind.log: {}", valgrind_log);
+
+        bail!("failed to execute valgrind");
+    }
+
+    // Check the exit code which was written to the file by the wrapper script.
+    if cmd_status != 0 {
         bail!("failed to execute the benchmark process");
     }