branch | stable |
changeset 823 | ab2ba4e79bed |
parent 822 | 842e2c76e64b |
child 824 | 6d3f8caef3b3 |
--- a/tests/run-tests.py Sun Sep 26 22:22:59 2010 +0200 +++ 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)