Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 12 Oct 2012 23:47:40 +0200
changeset 1144 3222b5b93410
parent 1141 4e2090ed2e72 (current diff)
parent 1143 38b7bb8f1c85 (diff)
child 1146 4139577a1e2a
Merge with stable
--- a/tests/run-tests.py	Fri Aug 10 20:37:20 2012 +0100
+++ b/tests/run-tests.py	Fri Oct 12 23:47:40 2012 +0200
@@ -921,6 +921,11 @@
             f.write(line)
         f.close()
 
+    def describe(ret):
+        if ret < 0:
+            return 'killed by signal %d' % -ret
+        return 'returned error code %d' % ret
+
     if skipped:
         mark = 's'
         if out is None:                 # debug mode: nothing to parse
@@ -948,13 +953,13 @@
                 showdiff(refout, out, ref, err)
             iolock.release()
         if ret:
-            fail("output changed and returned error code %d" % ret, ret)
+            fail("output changed and " + describe(ret), ret)
         else:
             fail("output changed", ret)
         ret = 1
     elif ret:
         mark = '!'
-        fail("returned error code %d" % ret, ret)
+        fail(describe(ret), ret)
     else:
         success()