Author: tfiala Date: Fri Jan 22 14:20:48 2016 New Revision: 258542 URL: http://llvm.org/viewvc/llvm-project?rev=258542&view=rev Log: fixed test suite crash when --platform-name doesn't start with 'remote-'
Also removes Darwin test case files from the expectedTimeout hard-coded file list. See: http://reviews.llvm.org/D16423 Modified: lldb/trunk/packages/Python/lldbsuite/test/dosep.py Modified: lldb/trunk/packages/Python/lldbsuite/test/dosep.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dosep.py?rev=258542&r1=258541&r2=258542&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/dosep.py (original) +++ lldb/trunk/packages/Python/lldbsuite/test/dosep.py Fri Jan 22 14:20:48 2016 @@ -1135,12 +1135,17 @@ def walk_and_invoke(test_files, dotest_a 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 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
