# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1349996714 25200
# Node ID 38b7bb8f1c85458984fe0b326a61d22017598c50
# Parent  2a75107bd979bfd06434ecfca86be208dc04307a
tests: correctly report a test killed by a signal

[ original upstream message ]

diff -r 2a75107bd979 -r 38b7bb8f1c85 tests/run-tests.py
--- a/tests/run-tests.py	Fri Oct 12 23:46:19 2012 +0200
+++ b/tests/run-tests.py	Thu Oct 11 16:05:14 2012 -0700
@@ -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()