Mercurial > hg

changeset 14006:a395575691a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: display diff before prompting with --interactive
author Patrick Mezard <pmezard@gmail.com>
date Mon, 25 Apr 2011 18:42:31 +0200
parents bb391e0515ba
children d764463b433e
files tests/run-tests.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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 = '!'