Mercurial > hg
comparison tests/run-tests.py @ 14006:a395575691a6
run-tests: display diff before prompting with --interactive
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 25 Apr 2011 18:42:31 +0200 |
| parents | ba734ff5cadd |
| children | 7ba2c728cf32 |
comparison
equal
deleted
inserted
replaced
| 14005:bb391e0515ba | 14006:a395575691a6 |
|---|---|
| 824 elif ret == 'timeout': | 824 elif ret == 'timeout': |
| 825 mark = 't' | 825 mark = 't' |
| 826 fail("timed out", ret) | 826 fail("timed out", ret) |
| 827 elif out != refout: | 827 elif out != refout: |
| 828 mark = '!' | 828 mark = '!' |
| 829 if ret: | 829 if not options.nodiff: |
| 830 fail("output changed and returned error code %d" % ret, ret) | |
| 831 else: | |
| 832 fail("output changed", ret) | |
| 833 if ret != 'timeout' and not options.nodiff: | |
| 834 iolock.acquire() | 830 iolock.acquire() |
| 835 if options.view: | 831 if options.view: |
| 836 os.system("%s %s %s" % (options.view, ref, err)) | 832 os.system("%s %s %s" % (options.view, ref, err)) |
| 837 else: | 833 else: |
| 838 showdiff(refout, out, ref, err) | 834 showdiff(refout, out, ref, err) |
| 839 iolock.release() | 835 iolock.release() |
| 836 if ret: | |
| 837 fail("output changed and returned error code %d" % ret, ret) | |
| 838 else: | |
| 839 fail("output changed", ret) | |
| 840 ret = 1 | 840 ret = 1 |
| 841 elif ret: | 841 elif ret: |
| 842 mark = '!' | 842 mark = '!' |
| 843 fail("returned error code %d" % ret, ret) | 843 fail("returned error code %d" % ret, ret) |
| 844 | 844 |