##// END OF EJS Templates
run-tests: fix error when timeout occurs
Simon Heimberg -
r8116:c11636f0 default
parent child Browse files
Show More
@@ -305,7 +305,7 b' class Timeout(Exception):'
305 def alarmed(signum, frame):
305 def alarmed(signum, frame):
306 raise Timeout
306 raise Timeout
307
307
308 def run(cmd):
308 def run(cmd, options):
309 """Run command in a sub-process, capturing the output (stdout and stderr).
309 """Run command in a sub-process, capturing the output (stdout and stderr).
310 Return the exist code, and output."""
310 Return the exist code, and output."""
311 # TODO: Use subprocess.Popen if we're running on Python 2.4
311 # TODO: Use subprocess.Popen if we're running on Python 2.4
@@ -411,7 +411,7 b' def runone(options, test, skips, fails):'
411 signal.alarm(options.timeout)
411 signal.alarm(options.timeout)
412
412
413 vlog("# Running", cmd)
413 vlog("# Running", cmd)
414 ret, out = run(cmd)
414 ret, out = run(cmd, options)
415 vlog("# Ret was:", ret)
415 vlog("# Ret was:", ret)
416
416
417 if options.timeout > 0:
417 if options.timeout > 0:
General Comments 0
You need to be logged in to leave comments. Login now