mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #3002 - RalfJung:miri-script, r=RalfJung

Browse Source 
fix oversight from new miri-script
This commit is contained in:
bors 2023-07-31 14:48:19 +00:00
commit 320cd7d551
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/miri/tests/compiletest.rs
View File

@ -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"),