Remove last XTIMEOUTs from android tests

TestHelloWorld seems to be passing now as far as I can tell. TestExitDuringStep is still hanging.
I have marked the relevant tests as flaky, which should handle the timeouts now as well. I'll be
monitoring the buildbots for fallout.

llvm-svn: 258114
This commit is contained in:
Pavel Labath 2016-01-19 10:59:10 +00:00
parent 8c6996f737
commit f82d71f025
2 changed files with 4 additions and 6 deletions

View File

@ -1144,12 +1144,7 @@ def getExpectedTimeouts(platform_name):
expected_timeout = set()
if target.startswith("android"):
expected_timeout |= {
"TestExitDuringStep.py",
"TestHelloWorld.py",
}
elif target.startswith("freebsd"):
if target.startswith("freebsd"):
expected_timeout |= {
"TestBreakpointConditions.py",
"TestChangeProcessGroup.py",

View File

@ -26,6 +26,7 @@ class ExitDuringStepTestCase(TestBase):
@skipIfFreeBSD # llvm.org/pr21411: test is hanging
@expectedFailureWindows("llvm.org/pr24681")
@expectedFlakeyAndroid("llvm.org/pr26206")
def test(self):
"""Test thread exit during step handling."""
self.build(dictionary=self.getBuildFlags())
@ -33,6 +34,7 @@ class ExitDuringStepTestCase(TestBase):
@skipIfFreeBSD # llvm.org/pr21411: test is hanging
@expectedFailureWindows("llvm.org/pr24681")
@expectedFlakeyAndroid("llvm.org/pr26206")
def test_step_over(self):
"""Test thread exit during step-over handling."""
self.build(dictionary=self.getBuildFlags())
@ -40,6 +42,7 @@ class ExitDuringStepTestCase(TestBase):
@skipIfFreeBSD # llvm.org/pr21411: test is hanging
@expectedFailureWindows("llvm.org/pr24681")
@expectedFlakeyAndroid("llvm.org/pr26206")
def test_step_in(self):
"""Test thread exit during step-in handling."""
self.build(dictionary=self.getBuildFlags())