Auto merge of #2179 - RalfJung:rustc, r=oli-obk

test ui output also in rustc test suite

`@oli-obk` when I just tried this locally (`./x.py test src/tools/miri --stage 0`), it worked fine. What differences had you seen before?
This commit is contained in:
bors 2022-06-13 13:13:29 +00:00
commit 9642534a33

View File

@ -38,7 +38,7 @@ fn run_tests(mode: Mode, path: &str, target: Option<String>) {
flags.push(target.clone());
}
let skip_ui_checks = in_rustc_test_suite || env::var_os("MIRI_SKIP_UI_CHECKS").is_some();
let skip_ui_checks = env::var_os("MIRI_SKIP_UI_CHECKS").is_some();
let output_conflict_handling = match (env::var_os("MIRI_BLESS").is_some(), skip_ui_checks) {
(false, false) => OutputConflictHandling::Error,