Auto merge of rust-lang#2884 - oli-obk:ui_test, r=RalfJung,oli-obk

Update to latest ui_test crate version.

Also stops using github actions groups that conflict with our groups as github does not nest them

Author: bors

src/tools/miri/Cargo.lock

@@ -820,9 +820,9 @@ dependencies = [
 
 [[package]]
 name = "ui_test"
-version = "0.6.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e10f5f88ce8c331a388deda1e6e2bd533c73ca89cc5f539a3df02ed35c8efba"
+checksum = "95033b0e41b8018013d99a6f1486c1ae5bd080378ced60c5f797e93842423b33"
 dependencies = [
  "bstr",
  "cargo-platform",

src/tools/miri/Cargo.toml

@@ -39,7 +39,7 @@ libloading = "0.7"
 
 [dev-dependencies]
 colored = "2"
-ui_test = "0.6.2"
+ui_test = "0.9"
 rustc_version = "0.4"
 # Features chosen to match those required by env_logger, to avoid rebuilds
 regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }

src/tools/miri/tests/compiletest.rs

@@ -2,6 +2,8 @@ use colored::*;
 use regex::bytes::Regex;
 use std::path::{Path, PathBuf};
 use std::{env, process::Command};
+use ui_test::status_emitter::StatusEmitter;
+use ui_test::CommandBuilder;
 use ui_test::{color_eyre::Result, Config, Match, Mode, OutputConflictHandling};
 
 fn miri_path() -> PathBuf {
@@ -44,40 +46,30 @@ fn build_so_for_c_ffi_tests() -> PathBuf {
 }
 
 fn run_tests(mode: Mode, path: &str, target: &str, with_dependencies: bool) -> Result<()> {
-    let mut config = Config {
-        target: Some(target.to_owned()),
-        stderr_filters: STDERR.clone(),
-        stdout_filters: STDOUT.clone(),
-        root_dir: PathBuf::from(path),
-        mode,
-        program: miri_path(),
-        quiet: false,
-        edition: Some("2021".into()),
-        ..Config::default()
-    };
+    // Miri is rustc-like, so we create a default builder for rustc and modify it
+    let mut program = CommandBuilder::rustc();
+    program.program = miri_path();
 
     let in_rustc_test_suite = option_env!("RUSTC_STAGE").is_some();
 
     // Add some flags we always want.
     if in_rustc_test_suite {
         // Less aggressive warnings to make the rustc toolstate management less painful.
         // (We often get warnings when e.g. a feature gets stabilized or some lint gets added/improved.)
-        config.args.push("-Astable-features".into());
-        config.args.push("-Aunused".into());
+        program.args.push("-Astable-features".into());
+        program.args.push("-Aunused".into());
     } else {
-        config.args.push("-Dwarnings".into());
-        config.args.push("-Dunused".into());
+        program.args.push("-Dwarnings".into());
+        program.args.push("-Dunused".into());
     }
     if let Ok(extra_flags) = env::var("MIRIFLAGS") {
         for flag in extra_flags.split_whitespace() {
-            config.args.push(flag.into());
+            program.args.push(flag.into());
         }
     }
-    config.args.push("-Zui-testing".into());
-    if let Some(target) = &config.target {
-        config.args.push("--target".into());
-        config.args.push(target.into());
-    }
+    program.args.push("-Zui-testing".into());
+    program.args.push("--target".into());
+    program.args.push(target.into());
 
     // If we're on linux, and we're testing the extern-so functionality,
     // then build the shared object file for testing external C function calls
@@ -86,18 +78,31 @@ fn run_tests(mode: Mode, path: &str, target: &str, with_dependencies: bool) -> R
         let so_file_path = build_so_for_c_ffi_tests();
         let mut flag = std::ffi::OsString::from("-Zmiri-extern-so-file=");
         flag.push(so_file_path.into_os_string());
-        config.args.push(flag);
+        program.args.push(flag);
     }
 
     let skip_ui_checks = env::var_os("MIRI_SKIP_UI_CHECKS").is_some();
 
-    config.output_conflict_handling = match (env::var_os("MIRI_BLESS").is_some(), skip_ui_checks) {
+    let output_conflict_handling = match (env::var_os("MIRI_BLESS").is_some(), skip_ui_checks) {
         (false, false) => OutputConflictHandling::Error,
         (true, false) => OutputConflictHandling::Bless,
         (false, true) => OutputConflictHandling::Ignore,
         (true, true) => panic!("cannot use MIRI_BLESS and MIRI_SKIP_UI_CHECKS at the same time"),
     };
 
+    let mut config = Config {
+        target: Some(target.to_owned()),
+        stderr_filters: STDERR.clone(),
+        stdout_filters: STDOUT.clone(),
+        root_dir: PathBuf::from(path),
+        mode,
+        program,
+        output_conflict_handling,
+        quiet: false,
+        edition: Some("2021".into()),
+        ..Config::default()
+    };
+
     // Handle command-line arguments.
     let mut after_dashdash = false;
     config.path_filter.extend(std::env::args().skip(1).filter(|arg| {
@@ -135,7 +140,14 @@ fn run_tests(mode: Mode, path: &str, target: &str, with_dependencies: bool) -> R
             "run".into(), // There is no `cargo miri build` so we just use `cargo miri run`.
         ];
     }
-    ui_test::run_tests(config)
+    ui_test::run_tests_generic(
+        config,
+        // The files we're actually interested in (all `.rs` files).
+        |path| path.extension().is_some_and(|ext| ext == "rs"),
+        // This could be used to overwrite the `Config` on a per-test basis.
+        |_, _| None,
+        TextAndGha,
+    )
 }
 
 macro_rules! regexes {
@@ -235,3 +247,45 @@ fn main() -> Result<()> {
 
     Ok(())
 }
+
+/// This is a custom renderer for `ui_test` output that does not emit github actions
+/// `group`s, while still producing regular github actions messages on test failures.
+struct TextAndGha;
+impl StatusEmitter for TextAndGha {
+    fn failed_test<'a>(
+        &'a self,
+        revision: &'a str,
+        path: &'a Path,
+        cmd: &'a Command,
+        stderr: &'a [u8],
+    ) -> Box<dyn std::fmt::Debug + 'a> {
+        Box::new((
+            ui_test::status_emitter::Gha::<false>.failed_test(revision, path, cmd, stderr),
+            ui_test::status_emitter::Text.failed_test(revision, path, cmd, stderr),
+        ))
+    }
+
+    fn run_tests(&self, _config: &Config) -> Box<dyn ui_test::status_emitter::DuringTestRun> {
+        Box::new(TextAndGha)
+    }
+
+    fn finalize(
+        &self,
+        failures: usize,
+        succeeded: usize,
+        ignored: usize,
+        filtered: usize,
+    ) -> Box<dyn ui_test::status_emitter::Summary> {
+        Box::new((
+            ui_test::status_emitter::Gha::<false>.finalize(failures, succeeded, ignored, filtered),
+            ui_test::status_emitter::Text.finalize(failures, succeeded, ignored, filtered),
+        ))
+    }
+}
+
+impl ui_test::status_emitter::DuringTestRun for TextAndGha {
+    fn test_result(&mut self, path: &Path, revision: &str, result: &ui_test::TestResult) {
+        ui_test::status_emitter::Text.test_result(path, revision, result);
+        ui_test::status_emitter::Gha::<false>.test_result(path, revision, result);
+    }
+}

src/tools/miri/tests/fail/alloc/deallocate-bad-alignment.rs

@@ -1,6 +1,6 @@
 use std::alloc::{alloc, dealloc, Layout};
 
-//@error-pattern: has size 1 and alignment 1, but gave size 1 and alignment 2
+//@error-in-other-file: has size 1 and alignment 1, but gave size 1 and alignment 2
 
 fn main() {
     unsafe {

src/tools/miri/tests/fail/alloc/deallocate-bad-size.rs

@@ -1,6 +1,6 @@
 use std::alloc::{alloc, dealloc, Layout};
 
-//@error-pattern: has size 1 and alignment 1, but gave size 2 and alignment 1
+//@error-in-other-file: has size 1 and alignment 1, but gave size 2 and alignment 1
 
 fn main() {
     unsafe {

src/tools/miri/tests/fail/alloc/deallocate-twice.rs

@@ -1,6 +1,6 @@
 use std::alloc::{alloc, dealloc, Layout};
 
-//@error-pattern: dereferenced after this allocation got freed
+//@error-in-other-file: dereferenced after this allocation got freed
 
 fn main() {
     unsafe {

src/tools/miri/tests/fail/alloc/global_system_mixup.rs

@@ -1,6 +1,6 @@
 // Make sure we detect when the `Global` and `System` allocators are mixed
 // (even when the default `Global` uses `System`).
-//@error-pattern: /deallocating .*, which is Rust heap memory, using .* heap deallocation operation/
+//@error-in-other-file: /deallocating .*, which is Rust heap memory, using .* heap deallocation operation/
 
 //@normalize-stderr-test: "using [A-Za-z]+ heap deallocation operation" -> "using PLATFORM heap deallocation operation"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"

src/tools/miri/tests/fail/alloc/reallocate-bad-size.rs

@@ -1,6 +1,6 @@
 use std::alloc::{alloc, realloc, Layout};
 
-//@error-pattern: has size 1 and alignment 1, but gave size 2 and alignment 1
+//@error-in-other-file: has size 1 and alignment 1, but gave size 2 and alignment 1
 
 fn main() {
     unsafe {

src/tools/miri/tests/fail/alloc/reallocate-dangling.rs

@@ -1,6 +1,6 @@
 use std::alloc::{alloc, dealloc, realloc, Layout};
 
-//@error-pattern: dereferenced after this allocation got freed
+//@error-in-other-file: dereferenced after this allocation got freed
 
 fn main() {
     unsafe {

src/tools/miri/tests/fail/alloc/stack_free.rs

@@ -1,7 +1,7 @@
 // Validation/SB changes why we fail
 //@compile-flags: -Zmiri-disable-validation -Zmiri-disable-stacked-borrows
 
-//@error-pattern: /deallocating .*, which is stack variable memory, using Rust heap deallocation operation/
+//@error-in-other-file: /deallocating .*, which is stack variable memory, using Rust heap deallocation operation/
 
 fn main() {
     let x = 42;

src/tools/miri/tests/fail/concurrency/libc_pthread_create_main_terminate.rs

@@ -1,5 +1,5 @@
 //@ignore-target-windows: No libc on Windows
-//@error-pattern: the main thread terminated without waiting for all remaining threads
+//@error-in-other-file: the main thread terminated without waiting for all remaining threads
 
 // Check that we terminate the program when the main thread terminates.
 

src/tools/miri/tests/fail/concurrency/windows_join_detached.rs

@@ -1,5 +1,5 @@
 //@only-target-windows: Uses win32 api functions
-//@error-pattern: Undefined Behavior: trying to join a detached thread
+//@error-in-other-file: Undefined Behavior: trying to join a detached thread
 
 // Joining a detached thread is undefined behavior.
 

src/tools/miri/tests/fail/deny_lint.rs

@@ -1,4 +1,4 @@
-//@error-pattern: miri cannot be run on programs that fail compilation
+//@error-in-other-file: miri cannot be run on programs that fail compilation
 
 #![deny(warnings)]
 

src/tools/miri/tests/fail/intrinsics/simd-float-to-int.rs

@@ -1,4 +1,4 @@
-//@error-pattern: cannot be represented in target type `i32`
+//@error-in-other-file: cannot be represented in target type `i32`
 #![feature(portable_simd)]
 use std::simd::*;
 

src/tools/miri/tests/fail/intrinsics/simd-gather.rs

@@ -1,4 +1,4 @@
-//@error-pattern: pointer to 1 byte starting at offset 9 is out-of-bounds
+//@error-in-other-file: pointer to 1 byte starting at offset 9 is out-of-bounds
 #![feature(portable_simd)]
 use std::simd::*;
 

src/tools/miri/tests/fail/intrinsics/simd-scatter.rs

@@ -1,4 +1,4 @@
-//@error-pattern: pointer to 1 byte starting at offset 9 is out-of-bounds
+//@error-in-other-file: pointer to 1 byte starting at offset 9 is out-of-bounds
 #![feature(portable_simd)]
 use std::simd::*;
 

src/tools/miri/tests/fail/layout_cycle.rs

@@ -1,4 +1,4 @@
-//@error-pattern: a cycle occurred during layout computation
+//@error-in-other-file: a cycle occurred during layout computation
 //~^ ERROR: cycle detected when computing layout of
 
 use std::mem;

src/tools/miri/tests/fail/memleak.rs

@@ -1,4 +1,4 @@
-//@error-pattern: memory leaked
+//@error-in-other-file: memory leaked
 //@normalize-stderr-test: ".*│.*" -> "$$stripped$$"
 
 fn main() {

src/tools/miri/tests/fail/memleak_no_backtrace.rs

@@ -1,5 +1,5 @@
 //@compile-flags: -Zmiri-disable-leak-backtraces
-//@error-pattern: the evaluated program leaked memory
+//@error-in-other-file: the evaluated program leaked memory
 //@normalize-stderr-test: ".*│.*" -> "$$stripped$$"
 
 fn main() {

src/tools/miri/tests/fail/memleak_rc.rs

@@ -1,4 +1,4 @@
-//@error-pattern: memory leaked
+//@error-in-other-file: memory leaked
 //@stderr-per-bitwidth
 //@normalize-stderr-test: ".*│.*" -> "$$stripped$$"
 

src/tools/miri/tests/fail/no_main.rs

@@ -1,2 +1,2 @@
-//@error-pattern: miri can only run programs that have a main function
+//@error-in-other-file: miri can only run programs that have a main function
 #![no_main]

src/tools/miri/tests/fail/panic/double_panic.rs

@@ -1,4 +1,4 @@
-//@error-pattern: the program aborted
+//@error-in-other-file: the program aborted
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
 //@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\n  +[0-9]+:[^\n]+" -> "$1"

src/tools/miri/tests/fail/panic/panic_abort1.rs

@@ -1,4 +1,4 @@
-//@error-pattern: the program aborted execution
+//@error-in-other-file: the program aborted execution
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
 //@normalize-stderr-test: "libc::abort\(\);|core::intrinsics::abort\(\);" -> "ABORT();"
 //@compile-flags: -C panic=abort

src/tools/miri/tests/fail/panic/panic_abort2.rs

@@ -1,4 +1,4 @@
-//@error-pattern: the program aborted execution
+//@error-in-other-file: the program aborted execution
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
 //@normalize-stderr-test: "libc::abort\(\);|core::intrinsics::abort\(\);" -> "ABORT();"
 //@compile-flags: -C panic=abort

src/tools/miri/tests/fail/panic/panic_abort3.rs

@@ -1,4 +1,4 @@
-//@error-pattern: the program aborted execution
+//@error-in-other-file: the program aborted execution
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
 //@normalize-stderr-test: "libc::abort\(\);|core::intrinsics::abort\(\);" -> "ABORT();"
 //@compile-flags: -C panic=abort

src/tools/miri/tests/fail/panic/panic_abort4.rs

@@ -1,4 +1,4 @@
-//@error-pattern: the program aborted execution
+//@error-in-other-file: the program aborted execution
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
 //@normalize-stderr-test: "libc::abort\(\);|core::intrinsics::abort\(\);" -> "ABORT();"
 //@compile-flags: -C panic=abort

src/tools/miri/tests/fail/shims/fs/isolated_file.rs

@@ -1,5 +1,5 @@
 //@ignore-target-windows: File handling is not implemented yet
-//@error-pattern: `open` not available when isolation is enabled
+//@error-in-other-file: `open` not available when isolation is enabled
 
 fn main() {
     let _file = std::fs::File::open("file.txt").unwrap();

src/tools/miri/tests/fail/stacked_borrows/deallocate_against_protector1.rs

@@ -1,4 +1,4 @@
-//@error-pattern: /deallocating while item \[Unique for .*\] is strongly protected/
+//@error-in-other-file: /deallocating while item \[Unique for .*\] is strongly protected/
 
 fn inner(x: &mut i32, f: fn(&mut i32)) {
     // `f` may mutate, but it may not deallocate!

src/tools/miri/tests/fail/stacked_borrows/drop_in_place_retag.rs

@@ -1,7 +1,7 @@
 //! Test that drop_in_place mutably retags the entire place, even for a type that does not need
 //! dropping, ensuring among other things that it is writeable
 
-//@error-pattern: /retag .* for Unique permission .* only grants SharedReadOnly permission/
+//@error-in-other-file: /retag .* for Unique permission .* only grants SharedReadOnly permission/
 
 fn main() {
     unsafe {

src/tools/miri/tests/fail/stacked_borrows/illegal_dealloc1.rs

@@ -1,4 +1,4 @@
-//@error-pattern: /deallocation .* tag does not exist in the borrow stack/
+//@error-in-other-file: /deallocation .* tag does not exist in the borrow stack/
 use std::alloc::{alloc, dealloc, Layout};
 
 fn main() {

src/tools/miri/tests/fail/stacked_borrows/issue-miri-1050-1.rs

@@ -1,4 +1,4 @@
-//@error-pattern: pointer to 4 bytes starting at offset 0 is out-of-bounds
+//@error-in-other-file: pointer to 4 bytes starting at offset 0 is out-of-bounds
 
 fn main() {
     unsafe {

src/tools/miri/tests/fail/stacked_borrows/issue-miri-1050-2.rs

@@ -1,4 +1,4 @@
-//@error-pattern: is a dangling pointer
+//@error-in-other-file: is a dangling pointer
 use std::ptr::NonNull;
 
 fn main() {

src/tools/miri/tests/fail/stacked_borrows/newtype_pair_retagging.rs

@@ -1,4 +1,4 @@
-//@error-pattern: which is strongly protected
+//@error-in-other-file: which is strongly protected
 struct Newtype<'a>(&'a mut i32, i32);
 
 fn dealloc_while_running(_n: Newtype<'_>, dealloc: impl FnOnce()) {

src/tools/miri/tests/fail/stacked_borrows/newtype_retagging.rs

@@ -1,4 +1,4 @@
-//@error-pattern: which is strongly protected
+//@error-in-other-file: which is strongly protected
 struct Newtype<'a>(&'a mut i32);
 
 fn dealloc_while_running(_n: Newtype<'_>, dealloc: impl FnOnce()) {

src/tools/miri/tests/fail/stacked_borrows/zst_slice.rs

@@ -1,5 +1,5 @@
 //@compile-flags: -Zmiri-strict-provenance
-//@error-pattern: /retag .* tag does not exist in the borrow stack/
+//@error-in-other-file: /retag .* tag does not exist in the borrow stack/
 
 fn main() {
     unsafe {

src/tools/miri/tests/fail/tokio/sleep.rs

@@ -1,6 +1,6 @@
 //@compile-flags: -Zmiri-permissive-provenance -Zmiri-backtrace=full
 //@only-target-x86_64-unknown-linux: support for tokio only on linux and x86
-//@error-pattern: returning ready events from epoll_wait is not yet implemented
+//@error-in-other-file: returning ready events from epoll_wait is not yet implemented
 //@normalize-stderr-test: " += note:.*\n" -> ""
 
 use tokio::time::{sleep, Duration, Instant};