Mercurial > public > mercurial-scm > hg-stable
diff tests/run-tests.py @ 8116:c11636f0609e
run-tests: fix error when timeout occurs
author | Simon Heimberg <simohe@besonet.ch> |
---|---|
date | Wed, 22 Apr 2009 09:11:46 +0200 |
parents | 0eeb4f0a5d21 |
children | 1bb8a75fceb3 |
line wrap: on
line diff
--- a/tests/run-tests.py Tue Apr 21 11:39:31 2009 +0300 +++ b/tests/run-tests.py Wed Apr 22 09:11:46 2009 +0200 @@ -305,7 +305,7 @@ def alarmed(signum, frame): raise Timeout -def run(cmd): +def run(cmd, options): """Run command in a sub-process, capturing the output (stdout and stderr). Return the exist code, and output.""" # TODO: Use subprocess.Popen if we're running on Python 2.4 @@ -411,7 +411,7 @@ signal.alarm(options.timeout) vlog("# Running", cmd) - ret, out = run(cmd) + ret, out = run(cmd, options) vlog("# Ret was:", ret) if options.timeout > 0: