corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 811370 - runcppunittests doesn't handle hangs gracefully. r=ahal

Browse Source
This commit is contained in:
Ted Mielczarek
2012-11-14 10:52:55 -05:00
parent 4182432162
commit 3d8a935069
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
testing/runcppunittests.py
View File

@@ -35,14 +35,11 @@ def run_one_test(prog, env, symbols_path=None):
proc = mozprocess.ProcessHandler([prog], proc = mozprocess.ProcessHandler([prog],
cwd=tempdir, cwd=tempdir,
env=env) env=env)
proc.run()
timeout = 300 timeout = 300
proc.processOutput(timeout=timeout) #TODO: After bug 811320 is fixed, don't let .run() kill the process,
if proc.timedOut: # instead use a timeout in .wait() and then kill to get a stack.
log.testFail("%s | timed out after %d seconds", proc.run(timeout=timeout)
basename, timeout) proc.wait()
return False
proc.waitForFinish(timeout=timeout)
if proc.timedOut: if proc.timedOut:
log.testFail("%s | timed out after %d seconds", log.testFail("%s | timed out after %d seconds",
basename, timeout) basename, timeout)