Mercurial > hg
changeset 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 | aa0d842b4f5d |
children | 05210e955bef |
files | tests/run-tests.py |
diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Mon Sep 27 10:48:50 2010 -0500 +++ b/tests/run-tests.py Mon Sep 27 22:49:30 2010 +0200 @@ -499,6 +499,9 @@ cmd = '/bin/sh "%s"' % name vlog("# Running", cmd) exitcode, output = run(cmd, options) + # do not merge output if skipped, return hghave message instead + if exitcode == SKIPPED_STATUS: + return exitcode, output finally: os.remove(name)