Skip to content

Commit fb3ac74

Browse files
committed
on an error, always print the unnormalized stderr
1 parent 9edbf36 commit fb3ac74

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

ui_test/src/lib.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ pub fn run_tests(config: Config) -> Result<()> {
172172
eprintln!();
173173
eprintln!("command: {:?}", miri);
174174
eprintln!();
175-
let mut dump_stderr = true;
176175
for error in errors {
177176
match error {
178177
Error::ExitStatus(mode, exit_status) => eprintln!("{mode:?} got {exit_status}"),
@@ -194,9 +193,6 @@ pub fn run_tests(config: Config) -> Result<()> {
194193
Error::PatternFoundInPassTest =>
195194
eprintln!("{}", "error pattern found in success test".red()),
196195
Error::OutputDiffers { path, actual, expected } => {
197-
if path.extension().unwrap() == "stderr" {
198-
dump_stderr = false;
199-
}
200196
eprintln!("actual output differed from expected {}", path.display());
201197
eprintln!("{}", pretty_assertions::StrComparison::new(expected, actual));
202198
eprintln!()
@@ -223,12 +219,9 @@ pub fn run_tests(config: Config) -> Result<()> {
223219
}
224220
eprintln!();
225221
}
226-
// Unless we already dumped the stderr via an OutputDiffers diff, let's dump it here.
227-
if dump_stderr {
228-
eprintln!("actual stderr:");
229-
eprintln!("{}", stderr);
230-
eprintln!();
231-
}
222+
eprintln!("full stderr:");
223+
eprintln!("{}", stderr);
224+
eprintln!();
232225
}
233226
eprintln!("{}", "failures:".red().underline());
234227
for (path, _miri, _revision, _errors, _stderr) in &failures {

0 commit comments

Comments
 (0)