run-tests: fix error when timeout occurs
authorSimon Heimberg <simohe@besonet.ch>
Wed, 22 Apr 2009 09:11:46 +0200
changeset 8116 c11636f0609e
parent 8115 ccf20c92534b
child 8117 2b30d8488819
run-tests: fix error when timeout occurs
tests/run-tests.py
--- 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: