fixup: fixed parallel walltime test; add fixtures for exectors

Author: not-matthias

src/run/runner/tests.rs

@@ -5,6 +5,7 @@ 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;
+use tokio::sync::{OnceCell, Semaphore, SemaphorePermit};
 
 const SIMPLE_ECHO_SCRIPT: &str = "echo 'Hello, World!'";
 const MULTILINE_ECHO_SCRIPT: &str = "echo \"Working\"
@@ -25,6 +26,41 @@ if [ \"$output\" != \"Hello\" ]; then
   exit 1
 fi";
 
+async fn get_valgrind_executor() -> &'static ValgrindExecutor {
+    static VALGRIND_EXECUTOR: OnceCell<ValgrindExecutor> = OnceCell::const_new();
+
+    VALGRIND_EXECUTOR
+        .get_or_init(|| async {
+            let executor = ValgrindExecutor;
+            let system_info = SystemInfo::new().unwrap();
+            executor.setup(&system_info).await.unwrap();
+            executor
+        })
+        .await
+}
+
+async fn get_walltime_executor() -> (SemaphorePermit<'static>, WallTimeExecutor) {
+    static WALLTIME_INIT: OnceCell<()> = OnceCell::const_new();
+    static WALLTIME_SEMAPHORE: OnceCell<Semaphore> = OnceCell::const_new();
+
+    WALLTIME_INIT
+        .get_or_init(|| async {
+            let executor = WallTimeExecutor::new();
+            let system_info = SystemInfo::new().unwrap();
+            executor.setup(&system_info).await.unwrap();
+        })
+        .await;
+
+    // We can't execute multiple walltime executors in parallel because perf isn't thread-safe (yet). We have to
+    // use a semaphore to limit concurrent access.
+    let semaphore = WALLTIME_SEMAPHORE
+        .get_or_init(|| async { Semaphore::new(1) })
+        .await;
+    let permit = semaphore.acquire().await.unwrap();
+
+    (permit, WallTimeExecutor::new())
+}
+
 async fn create_test_setup() -> (SystemInfo, RunData, TempDir) {
     let temp_dir = TempDir::new().unwrap();
 
@@ -44,9 +80,7 @@ async fn create_test_setup() -> (SystemInfo, RunData, TempDir) {
 #[tokio::test]
 async fn test_valgrind_executor(#[case] cmd: &str) {
     let (system_info, run_data, _temp_dir) = create_test_setup().await;
-
-    let executor = ValgrindExecutor;
-    executor.setup(&system_info).await.unwrap();
+    let executor = get_valgrind_executor().await;
 
     eprintln!("Running command: {cmd}");
 
@@ -78,9 +112,8 @@ async fn test_valgrind_executor(#[case] cmd: &str) {
 #[tokio::test]
 async fn test_walltime_executor(#[case] cmd: &str, #[case] enable_perf: bool) {
     let (system_info, run_data, _temp_dir) = create_test_setup().await;
-
-    let executor = WallTimeExecutor::new();
-    executor.setup(&system_info).await.unwrap();
+    let (_permit, executor) = get_walltime_executor().await;
+    let executor = executor;
 
     eprintln!("Running command: {cmd}");
 
@@ -108,9 +141,7 @@ async fn test_valgrind_executor_with_env(
     #[case] cmd: &str,
 ) {
     let (system_info, run_data, _temp_dir) = create_test_setup().await;
-
-    let executor = ValgrindExecutor;
-    executor.setup(&system_info).await.unwrap();
+    let executor = get_valgrind_executor().await;
 
     let config = Config {
         mode: RunnerMode::Instrumentation,
@@ -140,9 +171,8 @@ async fn test_walltime_executor_with_env(
     #[case] enable_perf: bool,
 ) {
     let (system_info, run_data, _temp_dir) = create_test_setup().await;
-
-    let executor = WallTimeExecutor::new();
-    executor.setup(&system_info).await.unwrap();
+    let (_permit, executor) = get_walltime_executor().await;
+    let executor = executor;
 
     let config = Config {
         mode: RunnerMode::Walltime,