Skip to content

Side: Fix ci tool when running with --test-threads #20346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 2, 2025
Merged

Side: Fix ci tool when running with --test-threads #20346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions tools/ci/src/commands/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,26 @@ impl Prepare for TestCommand {
let jobs = args.build_jobs();
let test_threads = args.test_threads();

vec![PreparedCommand::new::<Self>(
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::<Self>(
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::<Self>(
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.",
)
]
}
}
Loading