diff options
| author | bors <bors@rust-lang.org> | 2023-07-31 14:48:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-31 14:48:19 +0000 |
| commit | 320cd7d55111dc8acc4b2f4e6d4c51c4eba60d3e (patch) | |
| tree | 00c57d8cba9778fb8c7e9ae2f1e8df6e14f9dc19 /src | |
| parent | 10d77b96bf7024a9381a0855606fc08438670e4d (diff) | |
| parent | 26fc26f521076d498946ec616d036882958911d1 (diff) | |
| download | rust-320cd7d55111dc8acc4b2f4e6d4c51c4eba60d3e.tar.gz rust-320cd7d55111dc8acc4b2f4e6d4c51c4eba60d3e.zip | |
Auto merge of #3002 - RalfJung:miri-script, r=RalfJung
fix oversight from new miri-script
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/tests/compiletest.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/miri/tests/compiletest.rs b/src/tools/miri/tests/compiletest.rs index 8d82e6b8f9c..4006fe139db 100644 --- a/src/tools/miri/tests/compiletest.rs +++ b/src/tools/miri/tests/compiletest.rs @@ -76,7 +76,7 @@ fn test_config(target: &str, path: &str, mode: Mode, with_dependencies: bool) -> let skip_ui_checks = env::var_os("MIRI_SKIP_UI_CHECKS").is_some(); let output_conflict_handling = match (bless, skip_ui_checks) { - (false, false) => OutputConflictHandling::Error("./miri bless".into()), + (false, false) => OutputConflictHandling::Error("./miri test --bless".into()), (true, false) => OutputConflictHandling::Bless, (false, true) => OutputConflictHandling::Ignore, (true, true) => panic!("cannot use RUSTC_BLESS and MIRI_SKIP_UI_CHECKS at the same time"), |