Skip to content

Commit

Permalink
Auto merge of rust-lang#110177 - RalfJung:miri-tests, r=oli-obk
Browse files Browse the repository at this point in the history
fix running Miri tests

This partially reverts rust-lang#108659 to fix rust-lang#110102: the Miri test runner does not support any flags, they are interpreted as filters instead which leads to no tests being run.

I have not checked any of the other test runners for whether they are having any trouble with these flags.

Cc `@pietroalbini` `@Mark-Simulacrum` `@jyn514`
  • Loading branch information
bors committed Apr 14, 2023
2 parents 3e565f1 + 873ab04 commit b0884a3
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,10 @@ impl Step for Miri {
// Forward test filters.
cargo.arg("--").args(builder.config.cmd.test_args());

add_flags_and_try_run_tests(builder, &mut cargo.into());
// This can NOT be `add_flags_and_try_run_tests` since the Miri test runner
// does not understand those flags!
let mut cargo = Command::from(cargo);
builder.run(&mut cargo);

// # Run `cargo miri test`.
// This is just a smoke test (Miri's own CI invokes this in a bunch of different ways and ensures
Expand Down

0 comments on commit b0884a3

Please sign in to comment.