diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/dosep.py')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dosep.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dosep.py b/lldb/packages/Python/lldbsuite/test/dosep.py index 9b1b8a774f4..3ebb3aef963 100644 --- a/lldb/packages/Python/lldbsuite/test/dosep.py +++ b/lldb/packages/Python/lldbsuite/test/dosep.py @@ -1135,12 +1135,17 @@ def walk_and_invoke(test_files, dotest_argv, num_workers, test_runner_func): def getExpectedTimeouts(platform_name): # returns a set of test filenames that might timeout # are we running against a remote target? - host = sys.platform + + # Figure out the target system for which we're collecting + # the set of expected timeout test filenames. if platform_name is None: target = sys.platform else: m = re.search(r'remote-(\w+)', platform_name) - target = m.group(1) + if m is not None: + target = m.group(1) + else: + target = platform_name expected_timeout = set() @@ -1151,13 +1156,6 @@ def getExpectedTimeouts(platform_name): "TestValueObjectRecursion.py", "TestWatchpointConditionAPI.py", } - elif target.startswith("darwin"): - expected_timeout |= { - # times out on MBP Retina, Mid 2012 - "TestThreadSpecificBreakpoint.py", - "TestExitDuringStep.py", - "TestIntegerTypesExpr.py", - } return expected_timeout |
