Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/df807e63bd3c15a04493706febb299064187bf10 >--------------------------------------------------------------- commit df807e63bd3c15a04493706febb299064187bf10 Author: Joachim Breitner <[email protected]> Date: Mon Sep 17 13:28:36 2012 +0200 Print stdout diff even if stderr diff alrady fails (#7247) >--------------------------------------------------------------- driver/testlib.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/driver/testlib.py b/driver/testlib.py index ed7cbf7..7f22ac0 100644 --- a/driver/testlib.py +++ b/driver/testlib.py @@ -1198,9 +1198,11 @@ def simple_run( name, way, prog, args ): check_prof = my_rts_flags.find("-p") != -1 if not opts.ignore_output: - if not opts.combined_output and not check_stderr_ok(name): + bad_stderr = not opts.combined_output and not check_stderr_ok(name) + bad_stdout = not check_stdout_ok(name) + if bad_stderr: return failBecause('bad stderr') - if not check_stdout_ok(name): + if bad_stdout: return failBecause('bad stdout') # exit_code > 127 probably indicates a crash, so don't try to run hp2ps. if check_hp and (exit_code <= 127 or exit_code == 251) and not check_hp_ok(name): _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
