# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1289923146 -3600
# Node ID de49207ef1a566442c0b4d1f11340fd24d3c1d1b
# Parent  bbb042e55f49f75086707e87fcc7a4fa8f61fcc5# Parent  c333552ec003b620cc38a7e2ee8c745d8b13e704
Merge with stable

diff -r bbb042e55f49 -r de49207ef1a5 tests/run-tests.py
--- a/tests/run-tests.py	Tue Nov 09 10:31:54 2010 +0000
+++ b/tests/run-tests.py	Tue Nov 16 16:59:06 2010 +0100
@@ -504,7 +504,8 @@
         vlog("# Running", cmd)
         exitcode, output = run(cmd, options, replacements)
         # do not merge output if skipped, return hghave message instead
-        if exitcode == SKIPPED_STATUS:
+        # similarly, with --debug, output is None
+        if exitcode == SKIPPED_STATUS or output is None:
             return exitcode, output
     finally:
         os.remove(name)