|
1 | 1 | use super::Config; |
2 | 2 | use crate::executor::ExecutionContext; |
3 | 3 | use crate::executor::Executor; |
4 | | -use crate::executor::memory::executor::MemoryExecutor; |
5 | | -use crate::executor::valgrind::executor::ValgrindExecutor; |
6 | | -use crate::executor::wall_time::executor::WallTimeExecutor; |
7 | 4 | use crate::runner_mode::RunnerMode; |
8 | 5 | use crate::system::SystemInfo; |
9 | 6 | use rstest_reuse::{self, *}; |
@@ -109,16 +106,6 @@ const ENV_TESTS: [(&str, &str); 8] = [ |
109 | 106 | #[case(TESTS[5])] |
110 | 107 | fn test_cases(#[case] cmd: &str) {} |
111 | 108 |
|
112 | | -// Exec-harness currently does not support the inline multi command scripts |
113 | | -#[template] |
114 | | -#[rstest::rstest] |
115 | | -#[case(TESTS[0])] |
116 | | -#[case(TESTS[1])] |
117 | | -#[case(TESTS[2])] |
118 | | -fn exec_harness_test_cases() -> Vec<&'static str> { |
119 | | - EXEC_HARNESS_COMMANDS.to_vec() |
120 | | -} |
121 | | - |
122 | 109 | #[template] |
123 | 110 | #[rstest::rstest] |
124 | 111 | #[case(ENV_TESTS[0])] |
@@ -182,6 +169,7 @@ async fn acquire_bpf_instrumentation_lock() -> SemaphorePermit<'static> { |
182 | 169 |
|
183 | 170 | mod valgrind { |
184 | 171 | use super::*; |
| 172 | + use crate::executor::valgrind::executor::ValgrindExecutor; |
185 | 173 |
|
186 | 174 | async fn get_valgrind_executor() -> (SemaphorePermit<'static>, &'static ValgrindExecutor) { |
187 | 175 | static VALGRIND_EXECUTOR: OnceCell<ValgrindExecutor> = OnceCell::const_new(); |
@@ -240,8 +228,10 @@ mod valgrind { |
240 | 228 | } |
241 | 229 | } |
242 | 230 |
|
| 231 | +#[test_with::env(GITHUB_ACTIONS)] |
243 | 232 | mod walltime { |
244 | 233 | use super::*; |
| 234 | + use crate::executor::wall_time::executor::WallTimeExecutor; |
245 | 235 |
|
246 | 236 | async fn get_walltime_executor() -> (SemaphorePermit<'static>, WallTimeExecutor) { |
247 | 237 | static WALLTIME_INIT: OnceCell<()> = OnceCell::const_new(); |
|
358 | 348 | }) |
359 | 349 | .await; |
360 | 350 | } |
| 351 | + // |
| 352 | + // Exec-harness currently does not support the inline multi command scripts |
| 353 | + #[template] |
| 354 | + #[rstest::rstest] |
| 355 | + #[case(TESTS[0])] |
| 356 | + #[case(TESTS[1])] |
| 357 | + #[case(TESTS[2])] |
| 358 | + fn exec_harness_test_cases() -> Vec<&'static str> { |
| 359 | + EXEC_HARNESS_COMMANDS.to_vec() |
| 360 | + } |
361 | 361 |
|
362 | 362 | // Ensure that the walltime executor works with the exec-harness |
363 | 363 | #[apply(exec_harness_test_cases)] |
|
391 | 391 | } |
392 | 392 | } |
393 | 393 |
|
| 394 | +#[test_with::env(GITHUB_ACTIONS)] |
394 | 395 | mod memory { |
395 | 396 | use super::*; |
| 397 | + use crate::executor::memory::executor::MemoryExecutor; |
396 | 398 |
|
397 | 399 | async fn get_memory_executor() -> ( |
398 | 400 | SemaphorePermit<'static>, |
|
0 commit comments