# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 1392590484 -3600
# Node ID 2cb27f4b641c5dbc050dad0c3551d97cc0a8fa0d
# Parent  0ec1025011f4cef3fff618e01e0fe5af16652e57
run-tests: fixed warn detection on failures with too many output

The state "warned" was reported too often. The problem fixed here is that
warnonly was only reset when a line did not match. When there was a line too
much, warnonly remained set.
Fix this by setting more states to warnonly.

More negative testing (testing on result "Failed") has been done this time.

[ original upstream message ]

diff -r 0ec1025011f4 -r 2cb27f4b641c tests/run-tests.py
--- a/tests/run-tests.py	Sun Feb 16 23:36:02 2014 +0100
+++ b/tests/run-tests.py	Sun Feb 16 23:41:24 2014 +0100
@@ -776,7 +776,9 @@
 
     # Merge the script output back into a unified test
 
-    warnonly = True
+    warnonly = 1 # 1: not yet, 2: yes, 3: for sure not
+    if exitcode != 0: # failure has been reported
+        warnonly = 3 # set to "for sure not"
     pos = -1
     postout = []
     for l in output:
@@ -811,7 +813,9 @@
                     lout = stringescape(lout.rstrip('\n')) + " (esc)\n"
                 postout.append("  " + lout) # let diff deal with it
                 if r != '': # if line failed
-                    warnonly = False
+                    warnonly = 3 # set to "for sure not"
+                elif warnonly == 1: # is "not yet" (and line is warn only)
+                    warnonly = 2 # set to "yes" do warn
 
         if lcmd:
             # add on last return code
@@ -826,8 +830,8 @@
     if pos in after:
         postout += after.pop(pos)
 
-    if warnonly and exitcode == 0:
-        exitcode = False
+    if warnonly == 2:
+        exitcode = False # set exitcode to warned
     return exitcode, postout
 
 wifexited = getattr(os, "WIFEXITED", lambda x: False)