# HG changeset patch # User Thomas Arendsen Hein # Date 1285620570 -7200 # Node ID be4b0a397470aa1c3107ecdd9861bc0d995657ed # Parent aa0d842b4f5d57084d918cf88f1cde390fcbe367 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 diff -r aa0d842b4f5d -r be4b0a397470 tests/run-tests.py --- 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)