[Lldb-commits] [lldb] r240946 - dosep.py: Add ability to set default test timout based on target

[Pavel Labath]

Author: labath
Date: Mon Jun 29 09:16:51 2015
New Revision: 240946

URL: http://llvm.org/viewvc/llvm-project?rev=240946&view=rev
Log:
dosep.py: Add ability to set default test timout based on target

Summary:
Current default is 10 minutes, which causes the test suite to run very long in
case of test timeouts. On local linux, each test completes in under 90 seconds in the
slowest configuration (debug build of lldb, using debug clang to build
inferiors). I am changing the default to 4m on local targets, while retaining
the 10m timeout for remote ones.

Reviewers: sivachandra, vharron

Subscribers: tberghammer, lldb-commits

Differential Revision: http://reviews.llvm.org/D10527

Modified:
    lldb/trunk/test/dosep.py

Modified: lldb/trunk/test/dosep.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dosep.py?rev=240946&r1=240945&r2=240946&view=diff
==============================================================================
--- lldb/trunk/test/dosep.py (original)
+++ lldb/trunk/test/dosep.py Mon Jun 29 09:16:51 2015
@@ -61,8 +61,6 @@ def get_timeout_command():
 
 timeout_command = get_timeout_command()
 
-default_timeout = os.getenv("LLDB_TEST_TIMEOUT") or "10m"
-
 # Status codes for running command with timeout.
 eTimedOut, ePassed, eFailed = 124, 0, 1
 
@@ -272,6 +270,19 @@ def getExpectedTimeouts(platform_name):
         }
     return expected_timeout
 
+def getDefaultTimeout(platform_name):
+    if os.getenv("LLDB_TEST_TIMEOUT"):
+        return os.getenv("LLDB_TEST_TIMEOUT")
+
+    if platform_name is None:
+        platform_name = sys.platform
+
+    if platform_name.startswith("remote-"):
+        return "10m"
+    else:
+        return "4m"
+
+
 def touch(fname, times=None):
     with open(fname, 'a'):
         os.utime(fname, times)
@@ -361,6 +372,9 @@ Run lldb test suite using a separate pro
     if num_threads < 1:
         num_threads = 1
 
+    global default_timeout
+    default_timeout = getDefaultTimeout(dotest_options.lldb_platform_name)
+
     system_info = " ".join(platform.uname())
     (timed_out, failed, passed, all_fails, all_passes) = walk_and_invoke(test_directory, test_subdir, dotest_argv, num_threads)