Mercurial > hg
comparison tests/run-tests.py @ 13002:6747d4a5c45d
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.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Tue, 16 Nov 2010 10:33:19 +0900 |
parents | 158ca54a79cc |
children | 3da456d0c885 |
comparison
equal
deleted
inserted
replaced
13001:cc4e13c92dfa | 13002:6747d4a5c45d |
---|---|
502 | 502 |
503 cmd = '/bin/sh "%s"' % name | 503 cmd = '/bin/sh "%s"' % name |
504 vlog("# Running", cmd) | 504 vlog("# Running", cmd) |
505 exitcode, output = run(cmd, options, replacements) | 505 exitcode, output = run(cmd, options, replacements) |
506 # do not merge output if skipped, return hghave message instead | 506 # do not merge output if skipped, return hghave message instead |
507 if exitcode == SKIPPED_STATUS: | 507 # similarly, with --debug, output is None |
508 if exitcode == SKIPPED_STATUS or output is None: | |
508 return exitcode, output | 509 return exitcode, output |
509 finally: | 510 finally: |
510 os.remove(name) | 511 os.remove(name) |
511 | 512 |
512 def rematch(el, l): | 513 def rematch(el, l): |