run-tests: fix --debug for .t tests stable
authorNicolas Dumazet <nicdumz.commits@gmail.com>
Tue, 16 Nov 2010 10:33:19 +0900
branchstable
changeset 862 c333552ec003
parent 860 1ea19e827b5b
child 863 de49207ef1a5
child 865 b8755285ff18
run-tests: fix --debug for .t tests When --debug is given to the test runner, run() returns (retcode, None). Do not try to use None output as a string, and return directly, similarly as other testers. [ original upstream message ]
tests/run-tests.py
--- a/tests/run-tests.py	Mon Nov 08 10:56:47 2010 +0100
+++ b/tests/run-tests.py	Tue Nov 16 10:33:19 2010 +0900
@@ -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)