Bug 994830 - Make cppunittest test timeout less than mozharness process timeout; r=ted
authorDan Minor <dminor@mozilla.com>
Thu, 10 Apr 2014 15:24:29 -0400
changeset 197047 b62c590540b0a0b82924413a0f2bcf0022cc8713
parent 197046 00b716b32cdaa58bf6a631bf1130c0862ac2acfb
child 197048 2a82be80605cc3231e85963cf5feaf05976947f5
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs994830
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 994830 - Make cppunittest test timeout less than mozharness process timeout; r=ted
testing/runcppunittests.py
--- a/testing/runcppunittests.py
+++ b/testing/runcppunittests.py
@@ -9,17 +9,17 @@ import sys, os, tempfile, shutil
 from optparse import OptionParser
 import mozprocess, mozinfo, mozlog, mozcrash, mozfile
 from contextlib import contextmanager
 
 log = mozlog.getLogger('cppunittests')
 
 class CPPUnitTests(object):
     # Time (seconds) to wait for test process to complete
-    TEST_PROC_TIMEOUT = 1200
+    TEST_PROC_TIMEOUT = 900
     # Time (seconds) in which process will be killed if it produces no output.
     TEST_PROC_NO_OUTPUT_TIMEOUT = 300
 
     def run_one_test(self, prog, env, symbols_path=None):
         """
         Run a single C++ unit test program.
 
         Arguments: