--- 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 = '!'