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

Auto merge of #2232 - rust-lang:gesundheit, r=oli-obk

Browse Source 
Always show stderr on test failure.

fixes #2224

I overengineered the original thing to the point where it became fragile. Let's just always print stderr, unless it was already printed
This commit is contained in:
bors 2022-06-13 13:44:16 +00:00
commit 4c1f50bf2b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui_test/src/lib.rs
View File

@ -147,10 +147,7 @@ pub fn run_tests(config: Config) {
eprintln!(); eprintln!();
eprintln!("command: {:?}", miri); eprintln!("command: {:?}", miri);
eprintln!(); eprintln!();
// `None` means never dump, as we already dumped it for an `OutputDiffers` let mut dump_stderr = true;
// `Some(false)` means there's no reason to dump, as all errors are independent of the stderr
// `Some(true)` means that there was a pattern in the .rs file that was not found in the output.
let mut dump_stderr = Some(false);
for error in errors { for error in errors {
match error { match error {
Error::ExitStatus(mode, exit_status) => eprintln!("{mode:?} got {exit_status}"), Error::ExitStatus(mode, exit_status) => eprintln!("{mode:?} got {exit_status}"),
@ -160,7 +157,6 @@ pub fn run_tests(config: Config) {
"expected because of pattern here: {}:{definition_line}", "expected because of pattern here: {}:{definition_line}",
path.display().to_string().bold() path.display().to_string().bold()
); );
dump_stderr = dump_stderr.map(|_| true);
} }
Error::NoPatternsFound => { Error::NoPatternsFound => {
eprintln!("{}", "no error patterns found in failure test".red()); eprintln!("{}", "no error patterns found in failure test".red());
@ -169,7 +165,7 @@ pub fn run_tests(config: Config) {
eprintln!("{}", "error pattern found in success test".red()), eprintln!("{}", "error pattern found in success test".red()),
Error::OutputDiffers { path, actual, expected } => { Error::OutputDiffers { path, actual, expected } => {
if path.extension().unwrap() == "stderr" { if path.extension().unwrap() == "stderr" {
dump_stderr = None; dump_stderr = false;
} }
eprintln!("actual output differed from expected {}", path.display()); eprintln!("actual output differed from expected {}", path.display());
eprintln!("{}", pretty_assertions::StrComparison::new(expected, actual)); eprintln!("{}", pretty_assertions::StrComparison::new(expected, actual));
@ -203,7 +199,8 @@ pub fn run_tests(config: Config) {
} }
eprintln!(); eprintln!();
} }
if let Some(true) = dump_stderr { // Unless we already dumped the stderr via an OutputDiffers diff, let's dump it here.
if dump_stderr {
eprintln!("actual stderr:"); eprintln!("actual stderr:");
eprintln!("{}", stderr); eprintln!("{}", stderr);
eprintln!(); eprintln!();