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 178551 b62c590540b0a0b82924413a0f2bcf0022cc8713
parent 178550 00b716b32cdaa58bf6a631bf1130c0862ac2acfb
child 178552 2a82be80605cc3231e85963cf5feaf05976947f5
push idunknown
push userunknown
push dateunknown
reviewersted
bugs994830
milestone31.0a1
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: