From f41f63d551f242af17ed76b34302e009847cff6f Mon Sep 17 00:00:00 2001 From: Lucas Farias Date: Mon, 28 Jul 2025 19:45:22 -0300 Subject: [PATCH] Side: Fix `ci` tool when running with `--test-threads` --- tools/ci/src/commands/test.rs | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/tools/ci/src/commands/test.rs b/tools/ci/src/commands/test.rs index a904e59c46c99..68fc9ba67c5dd 100644 --- a/tools/ci/src/commands/test.rs +++ b/tools/ci/src/commands/test.rs @@ -13,14 +13,26 @@ impl Prepare for TestCommand { let jobs = args.build_jobs(); let test_threads = args.test_threads(); - vec![PreparedCommand::new::( - cmd!( - sh, - // `--benches` runs each benchmark once in order to verify that they behave - // correctly and do not panic. - "cargo test --workspace --lib --bins --tests --benches {no_fail_fast...} {jobs...} -- {test_threads...}" + let jobs_ref = &jobs; + let test_threads_ref = &test_threads; + + vec![ + PreparedCommand::new::( + cmd!( + sh, + "cargo test --workspace --lib --bins --tests {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}" + ), + "Please fix failing tests in output above.", ), - "Please fix failing tests in output above.", - )] + PreparedCommand::new::( + cmd!( + sh, + // `--benches` runs each benchmark once in order to verify that they behave + // correctly and do not panic. + "cargo test --workspace --benches {no_fail_fast...} {jobs...}" + ), + "Please fix failing tests in output above.", + ) + ] } }