fix: valgrind test

Author: not-matthias

src/run/runner/tests.rs

@@ -1,9 +1,9 @@
-use crate::prelude::*;
 use crate::run::check_system::SystemInfo;
 use crate::run::config::Config;
 use crate::run::instruments::mongo_tracer::MongoTracer;
 use crate::run::runner::executor::Executor;
 use crate::run::runner::interfaces::RunData;
+use crate::run::runner::valgrind::executor::ValgrindExecutor;
 use crate::run::{RunnerMode, runner::wall_time::executor::WallTimeExecutor};
 use tempfile::TempDir;
 
@@ -15,41 +15,21 @@ const MULTILINE_ECHO_WITH_SEMICOLONS: &str = "echo \"Working\";
 echo \"with\";
 echo \"multiple lines\";";
 
-const ENV_VAR_VALIDATION_SCRIPT: &str = "export MY_ENV_VAR=\"Hello\"
-output=$(echo \"$MY_ENV_VAR\")
-if [ \"$output\" != \"Hello\" ]; then
-  echo \"Assertion failed: Expected 'Hello' but got '$output'\"
-  exit 1
-fi";
-
-const ENV_VAR_VALIDATION_FAIL_SCRIPT: &str = "MY_ENV_VAR=\"Wrong\"
-output=$(echo \"$MY_ENV_VAR\")
-if [ \"$output\" != \"Hello\" ]; then
-  echo \"Assertion failed: Expected 'Hello' but got '$output'\"
-  exit 1
-fi";
-
 const DIRECTORY_CHECK_SCRIPT: &str = "cd /tmp
 # Check that the directory is actually changed
 if [ $(basename $(pwd)) != \"tmp\" ]; then
   exit 1
 fi";
 
-const BENCHMARK_COMMANDS: [&str; 6] = [
+const BENCHMARK_COMMANDS: [&str; 5] = [
     "echo 'Hello, World!'",
-    "date",
     MULTILINE_ECHO_WITH_SEMICOLONS,
     MULTILINE_ECHO_WITH_SEMICOLONS,
     MULTILINE_ECHO_SCRIPT,
     DIRECTORY_CHECK_SCRIPT,
-    // ENV_VAR_VALIDATION_SCRIPT,
-    // ENV_VAR_VALIDATION_FAIL_SCRIPT,
 ];
-//  temp_env::with_var("TEST_ENV_VAR", "test_value".into(), || {
-//             assert_eq!(safe_run("echo $TEST_ENV_VAR"), (0, 0));
-//         });
 
-async fn create_test_setup() -> (SystemInfo, RunData, Option<MongoTracer>) {
+async fn create_test_setup() -> (SystemInfo, RunData, Option<MongoTracer>, TempDir) {
     let temp_dir = TempDir::new().unwrap();
 
     let system_info = SystemInfo::test();
@@ -58,34 +38,35 @@ async fn create_test_setup() -> (SystemInfo, RunData, Option<MongoTracer>) {
     };
     let mongo_tracer = None;
 
-    (system_info, run_data, mongo_tracer)
+    (system_info, run_data, mongo_tracer, temp_dir)
 }
 
-// #[tokio::test]
-// async fn test_valgrind_executor() {
-//     let executor = ValgrindExecutor;
-//     let (system_info, run_data, _mongo_tracer) = create_test_setup().await;
-
-//     let config = Config {
-//         mode: RunnerMode::Instrumentation,
-//         command: "echo 'Hello, World!'".to_string(),
-//         ..Config::test()
-//     };
-
-//     executor.setup(&system_info).await.unwrap();
-//     executor
-//         .run(&config, &system_info, &run_data, &None)
-//         .await
-//         .unwrap();
-//     executor
-//         .teardown(&config, &system_info, &run_data)
-//         .await
-//         .unwrap();
-// }
+#[tokio::test]
+async fn test_valgrind_executor() {
+    let (system_info, run_data, _mongo_tracer, _temp_dir) = create_test_setup().await;
+
+    let executor = ValgrindExecutor;
+    executor.setup(&system_info).await.unwrap();
+
+    for cmd in BENCHMARK_COMMANDS {
+        eprintln!("Running command: {cmd}");
+
+        let config = Config {
+            mode: RunnerMode::Instrumentation,
+            command: cmd.to_string(),
+            ..Config::test()
+        };
+
+        executor
+            .run(&config, &system_info, &run_data, &None)
+            .await
+            .unwrap();
+    }
+}
 
 #[tokio::test]
 async fn test_walltime_executor() {
-    let (system_info, run_data, _mongo_tracer) = create_test_setup().await;
+    let (system_info, run_data, _mongo_tracer, _temp_dir) = create_test_setup().await;
 
     let executor = WallTimeExecutor::new();
     executor.setup(&system_info).await.unwrap();