# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1302461499 -7200
# Node ID 2357dbe7fabf868919fd9637fdba15adf97a42e0
# Parent  91b4389198997ad5c991ca108d6b2226eda99cbf# Parent  97ec5d6590399cb6fc83124cf9541e06f8549119
Merge with stable

diff -r 91b438919899 -r 2357dbe7fabf tests/run-tests.py
--- a/tests/run-tests.py	Tue Apr 05 16:35:41 2011 +0200
+++ b/tests/run-tests.py	Sun Apr 10 20:51:39 2011 +0200
@@ -620,7 +620,8 @@
                 ret = os.WEXITSTATUS(ret)
         except Timeout:
             vlog('# Process %d timed out - killing it' % proc.pid)
-            ret = cleanup()
+            cleanup()
+            ret = 'timeout'
             output += ("\n### Abort: timeout after %d seconds.\n"
                        % options.timeout)
         except KeyboardInterrupt:
@@ -752,11 +753,13 @@
             skip(missing[-1])
     elif out != refout:
         mark = '!'
-        if ret:
+        if ret == 'timeout':
+            fail("timed out")
+        elif ret:
             fail("output changed and returned error code %d" % ret)
         else:
             fail("output changed")
-        if not options.nodiff:
+        if ret != 'timeout' and not options.nodiff:
             if options.view:
                 os.system("%s %s %s" % (options.view, ref, err))
             else: