Mercurial > hg > mercurial-source
comparison tests/run-tests.py @ 12573:be4b0a397470
tests: show skip reason instead of "irrelevant" with unified tests, too
parsehghaveoutput expects just the test output, not the merged test/output,
so for skipped unified tests e.g.:
Skipped test-convert-darcs.t: missing feature: irrelevant
was shown instead of:
Skipped test-convert-darcs.t: missing feature: darcs client
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 27 Sep 2010 22:49:30 +0200 |
| parents | 41f2fa72fa82 |
| children | 9a2de8dae27b |
comparison
equal
deleted
inserted
replaced
| 12572:aa0d842b4f5d | 12573:be4b0a397470 |
|---|---|
| 497 os.close(fd) | 497 os.close(fd) |
| 498 | 498 |
| 499 cmd = '/bin/sh "%s"' % name | 499 cmd = '/bin/sh "%s"' % name |
| 500 vlog("# Running", cmd) | 500 vlog("# Running", cmd) |
| 501 exitcode, output = run(cmd, options) | 501 exitcode, output = run(cmd, options) |
| 502 # do not merge output if skipped, return hghave message instead | |
| 503 if exitcode == SKIPPED_STATUS: | |
| 504 return exitcode, output | |
| 502 finally: | 505 finally: |
| 503 os.remove(name) | 506 os.remove(name) |
| 504 | 507 |
| 505 def rematch(el, l): | 508 def rematch(el, l): |
| 506 try: | 509 try: |