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

bors · bors · commit 9642534a33c0 · 2022-06-13T13:13:29.000Z
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?
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ fn run_tests(mode: Mode, path: &str, target: Option<String>) {`
`38`	`38`	`flags.push(target.clone());`
`39`	`39`	`}`
`40`	`40`
`41`		`- let skip_ui_checks = in_rustc_test_suite \|\| env::var_os("MIRI_SKIP_UI_CHECKS").is_some();`
	`41`	`+ let skip_ui_checks = env::var_os("MIRI_SKIP_UI_CHECKS").is_some();`
`42`	`42`
`43`	`43`	`let output_conflict_handling = match (env::var_os("MIRI_BLESS").is_some(), skip_ui_checks) {`
`44`	`44`	`(false, false) => OutputConflictHandling::Error,`