# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1303749751 -7200
# Node ID a395575691a6d2a9b84c46e2c6c4dd09e406317f
# Parent  bb391e0515ba7de5e49cdd77e95633cb5abbe5b7
run-tests: display diff before prompting with --interactive

diff -r bb391e0515ba -r a395575691a6 tests/run-tests.py
--- a/tests/run-tests.py	Sat Apr 23 00:52:21 2011 +0300
+++ b/tests/run-tests.py	Mon Apr 25 18:42:31 2011 +0200
@@ -826,17 +826,17 @@
         fail("timed out", ret)
     elif out != refout:
         mark = '!'
-        if ret:
-            fail("output changed and returned error code %d" % ret, ret)
-        else:
-            fail("output changed", ret)
-        if ret != 'timeout' and not options.nodiff:
+        if not options.nodiff:
             iolock.acquire()
             if options.view:
                 os.system("%s %s %s" % (options.view, ref, err))
             else:
                 showdiff(refout, out, ref, err)
             iolock.release()
+        if ret:
+            fail("output changed and returned error code %d" % ret, ret)
+        else:
+            fail("output changed", ret)
         ret = 1
     elif ret:
         mark = '!'