Skip to content

Commit b0884a3

Browse files
committed
Auto merge of rust-lang#110177 - RalfJung:miri-tests, r=oli-obk
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`
2 parents 3e565f1 + 873ab04 commit b0884a3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/bootstrap/test.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,10 @@ impl Step for Miri {
638638
// Forward test filters.
639639
cargo.arg("--").args(builder.config.cmd.test_args());
640640

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

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

0 commit comments

Comments
 (0)