Bump the default timeout in dosep.py to 10m.

[sivachandra]

Summary

This seems to be sufficient to get the tests taking longer than the
previous timeout of 5m to run to completion on Android to pass instead
of timing out.

[chaoren]

test/dosep.py

50–51

Please update comment too.

[chaoren]

test/dosep.py

6

Please update this.

8

Ditto.

50–51

Actually, this special case should probably just be removed.

156

And this.

158

Here too.

[sivachandra]

Remove the special case for TestConcurrentEvents.

[sivachandra]

Update comments.

test/dosep.py

 #!/usr/bin/env python
 
 """
 Run the test suite using a separate process for each test file.
 
 Each test will run with a time limit of 5 minutes by default.
 
 Override the default time limit of 5 minutes by setting
 the environment variable LLDB_TEST_TIMEOUT.
 
 E.g., export LLDB_TEST_TIMEOUT=10m
 
 Override the time limit for individual tests by setting
 the environment variable LLDB_[TEST NAME]_TIMEOUT.
 
 E.g., export LLDB_TESTCONCURRENTEVENTS_TIMEOUT=2m
def get_timeout_command():
     try:
         subprocess.call("gtimeout")
         return "gtimeout"
     except OSError:
         pass
     return None
 
 timeout_command = get_timeout_command()
 
-# TestConcurrentEvents is a long test and it times out with default 5m timeout.
-# Increase its timeout if it hasn't been already set.
-if os.environ.get('LLDB_TEST_TIMEOUT') == None and os.environ.get('LLDB_TESTCONCURRENTEVENTS_TIMEOUT') == None:
-    os.environ['LLDB_TESTCONCURRENTEVENTS_TIMEOUT'] = "7m"
-
-default_timeout = os.getenv("LLDB_TEST_TIMEOUT") or "5m"
+default_timeout = os.getenv("LLDB_TEST_TIMEOUT") or "10m"
 
 # Status codes for running command with timeout.
 eTimedOut, ePassed, eFailed = 124, 0, 1
 
 def call_with_timeout(command, timeout):
     """Run command with a timeout if possible."""
     if os.name != "nt":
         if timeout_command and timeout != "0":
def walk_and_invoke(test_root, dotest_options, num_threads):
     return (timed_out, failed, passed)
 
 def main():
     test_root = sys.path[0]
 
     parser = OptionParser(usage="""\
 Run lldb test suite using a separate process for each test file.
 
        Each test will run with a time limit of 5 minutes by default.
 
        Override the default time limit of 5 minutes by setting
        the environment variable LLDB_TEST_TIMEOUT.
 
        E.g., export LLDB_TEST_TIMEOUT=10m
 
        Override the time limit for individual tests by setting
        the environment variable LLDB_[TEST NAME]_TIMEOUT.
 
        E.g., export LLDB_TESTCONCURRENTEVENTS_TIMEOUT=2m