diff options
| author | bors <bors@rust-lang.org> | 2023-04-14 12:52:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-14 12:52:27 +0000 |
| commit | b0884a3528c45a5d575e182f407c759d243fdcba (patch) | |
| tree | bbcdf633fd44c02f6aa56067647227783c8fa9da | |
| parent | 3e565f1a27a19f7da48c7109500b4351c0819e68 (diff) | |
| parent | 873ab04d898b32cd9196d15e68c724d583c07f17 (diff) | |
| download | rust-b0884a3528c45a5d575e182f407c759d243fdcba.tar.gz rust-b0884a3528c45a5d575e182f407c759d243fdcba.zip | |
Auto merge of #110177 - RalfJung:miri-tests, r=oli-obk
fix running Miri tests This partially reverts https://github.com/rust-lang/rust/pull/108659 to fix https://github.com/rust-lang/rust/issues/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`
| -rw-r--r-- | src/bootstrap/test.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index cc0e34c6035..2bf28674d36 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -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 |