diff --git a/ui_test/src/lib.rs b/ui_test/src/lib.rs index 16f7be30f8b..917e382379a 100644 --- a/ui_test/src/lib.rs +++ b/ui_test/src/lib.rs @@ -164,15 +164,14 @@ pub fn run_tests(config: Config) -> Result<()> { if !failures.is_empty() { for (path, miri, revision, errors, stderr) in &failures { eprintln!(); - eprint!("{}", path.display().to_string().underline()); + eprint!("{}", path.display().to_string().underline().bold()); if !revision.is_empty() { eprint!(" (revision `{}`)", revision); } - eprint!(" {}", "FAILED".red()); + eprint!(" {}", "FAILED:".red().bold()); eprintln!(); eprintln!("command: {:?}", miri); eprintln!(); - let mut dump_stderr = true; for error in errors { match error { Error::ExitStatus(mode, exit_status) => eprintln!("{mode:?} got {exit_status}"), @@ -194,9 +193,6 @@ pub fn run_tests(config: Config) -> Result<()> { Error::PatternFoundInPassTest => eprintln!("{}", "error pattern found in success test".red()), Error::OutputDiffers { path, actual, expected } => { - if path.extension().unwrap() == "stderr" { - dump_stderr = false; - } eprintln!("actual output differed from expected {}", path.display()); eprintln!("{}", pretty_assertions::StrComparison::new(expected, actual)); eprintln!() @@ -223,14 +219,11 @@ pub fn run_tests(config: Config) -> Result<()> { } eprintln!(); } - // Unless we already dumped the stderr via an OutputDiffers diff, let's dump it here. - if dump_stderr { - eprintln!("actual stderr:"); - eprintln!("{}", stderr); - eprintln!(); - } + eprintln!("full stderr:"); + eprintln!("{}", stderr); + eprintln!(); } - eprintln!("{}", "failures:".red().underline()); + eprintln!("{}", "FAILURES:".red().underline().bold()); for (path, _miri, _revision, _errors, _stderr) in &failures { eprintln!(" {}", path.display()); }