# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1285620570 -7200
# Node ID ab2ba4e79bed961e063875c805915e7a2f923aa4
# Parent  842e2c76e64be1fbabb22568b30758f79edf29f6
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

[ original upstream description ]

diff -r 842e2c76e64b -r ab2ba4e79bed tests/run-tests.py
--- 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)