Author: labath
Date: Tue Jan 19 04:59:10 2016
New Revision: 258114

URL: http://llvm.org/viewvc/llvm-project?rev=258114&view=rev
Log:
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.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/dosep.py
    
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.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=258114&r1=258113&r2=258114&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dosep.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dosep.py Tue Jan 19 04:59:10 2016
@@ -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",

Modified: 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py?rev=258114&r1=258113&r2=258114&view=diff
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
 (original)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
 Tue Jan 19 04:59:10 2016
@@ -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())


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to