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

llvm-svn: 258542
This commit is contained in:
Todd Fiala 2016-01-22 20:20:48 +00:00
parent 8e491e2d02
commit f8f8a6de06
1 changed files with 7 additions and 9 deletions

View File

@ -1135,12 +1135,17 @@ def walk_and_invoke(test_files, dotest_argv, num_workers, test_runner_func):
def getExpectedTimeouts(platform_name): def getExpectedTimeouts(platform_name):
# returns a set of test filenames that might timeout # returns a set of test filenames that might timeout
# are we running against a remote target? # 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: if platform_name is None:
target = sys.platform target = sys.platform
else: else:
m = re.search(r'remote-(\w+)', platform_name) m = re.search(r'remote-(\w+)', platform_name)
if m is not None:
target = m.group(1) target = m.group(1)
else:
target = platform_name
expected_timeout = set() expected_timeout = set()
@ -1151,13 +1156,6 @@ def getExpectedTimeouts(platform_name):
"TestValueObjectRecursion.py", "TestValueObjectRecursion.py",
"TestWatchpointConditionAPI.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 return expected_timeout