[Lldb-commits] [lldb] r223441 - Reverting r223423, test timeout

[Vince Harron]

Author: vharron
Date: Thu Dec  4 20:06:03 2014
New Revision: 223441

URL: http://llvm.org/viewvc/llvm-project?rev=223441&view=rev
Log:
Reverting r223423, test timeout

Was causing dosep to hang in some cases.


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=223441&r1=223440&r2=223441&view=diff
==============================================================================
--- lldb/trunk/test/dosep.py (original)
+++ lldb/trunk/test/dosep.py Thu Dec  4 20:06:03 2014
@@ -7,29 +7,15 @@ Run the test suite using a separate proc
 import multiprocessing
 import os
 import platform
-import shlex
-import subprocess
 import sys
 
 from optparse import OptionParser
 
-def try_timeout(command):
-    if not sys.platform.startswith("win32"):
-        try:
-            return {0: "passed", 124: "timed out"}.get(
-                subprocess.call(["timeout", "5m"] + command), "failed")
-        except OSError:
-            pass
-        try:
-            return {0: "passed", 124: "timed out"}.get(
-                subprocess.call(["gtimeout", "5m"] + command), "failed")
-        except OSError:
-            pass
-    return "passed" if subprocess.call(command) == 0 else "failed"
+# Command template of the invocation of the test driver.
+template = '%s %s/dotest.py %s -p %s %s'
 
 def process_dir(root, files, test_root, dotest_options):
     """Examine a directory for tests, and invoke any found within it."""
-    timed_out = []
     failed = []
     passed = []
     for name in files:
@@ -43,17 +29,12 @@ def process_dir(root, files, test_root,
         if os.path.islink(path):
             continue
 
-        command = ([sys.executable, "%s/dotest.py" % test_root] +
-                   (shlex.split(dotest_options) if dotest_options else []) +
-                   ["-p", name, root])
-        exit_status = try_timeout(command)
-        if "passed" != exit_status:
-            if "timed out" == exit_status:
-                timed_out.append(name)
+        command = template % (sys.executable, test_root, dotest_options if dotest_options else "", name, root)
+        if 0 != os.system(command):
             failed.append(name)
         else:
             passed.append(name)
-    return (timed_out, failed, passed)
+    return (failed, passed)
 
 in_q = None
 out_q = None
@@ -85,17 +66,15 @@ def walk_and_invoke(test_root, dotest_op
         for work_item in test_work_items:
             test_results.append(process_dir_worker(work_item))
 
-    timed_out = []
     failed = []
     passed = []
 
     for test_result in test_results:
-        (dir_timed_out, dir_failed, dir_passed) = test_result
-        timed_out += dir_timed_out
+        (dir_failed, dir_passed) = test_result
         failed += dir_failed
         passed += dir_passed
 
-    return (timed_out, failed, passed)
+    return (failed, passed)
 
 def main():
     test_root = sys.path[0]
@@ -128,8 +107,7 @@ Run lldb test suite using a separate pro
         num_threads = 1
 
     system_info = " ".join(platform.uname())
-    (timed_out, failed, passed) = walk_and_invoke(test_root, dotest_options,
-                                                  num_threads)
+    (failed, passed) = walk_and_invoke(test_root, dotest_options, num_threads)
     num_tests = len(failed) + len(passed)
 
     print "Ran %d tests." % num_tests
@@ -137,9 +115,7 @@ Run lldb test suite using a separate pro
         failed.sort()
         print "Failing Tests (%d)" % len(failed)
         for f in failed:
-            print "%s: LLDB (suite) :: %s (%s)" % (
-                "TIMEOUT" if f in timed_out else "FAIL", f, system_info
-            )
+          print "FAIL: LLDB (suite) :: %s (%s)" % (f, system_info)
         sys.exit(1)
     sys.exit(0)