Ticket #7247: 0001-Print-stdout-diff-even-if-stderr-diff-alrady-fails.patch

File 0001-Print-stdout-diff-even-if-stderr-diff-alrady-fails.patch, 1.1 KB (added by nomeata, 3 years ago)
  • driver/testlib.py

    From 27eaa0359b6169cad59325c33d1491d25ae47be3 Mon Sep 17 00:00:00 2001
    From: Joachim Breitner <[email protected]>
    Date: Mon, 17 Sep 2012 13:28:36 +0200
    Subject: [PATCH] Print stdout diff even if stderr diff alrady fails
    
    ---
     driver/testlib.py |    6 ++++--
     1 file changed, 4 insertions(+), 2 deletions(-)
    
    diff --git a/driver/testlib.py b/driver/testlib.py
    index ed7cbf7..7f22ac0 100644
    a b def simple_run( name, way, prog, args ): 
    11981198    check_prof = my_rts_flags.find("-p") != -1 
    11991199 
    12001200    if not opts.ignore_output: 
    1201         if not opts.combined_output and not check_stderr_ok(name): 
     1201        bad_stderr = not opts.combined_output and not check_stderr_ok(name) 
     1202        bad_stdout = not check_stdout_ok(name) 
     1203        if bad_stderr: 
    12021204            return failBecause('bad stderr') 
    1203         if not check_stdout_ok(name): 
     1205        if bad_stdout: 
    12041206            return failBecause('bad stdout') 
    12051207        # exit_code > 127 probably indicates a crash, so don't try to run hp2ps. 
    12061208        if check_hp and (exit_code <= 127 or exit_code == 251) and not check_hp_ok(name):