[Lldb-commits] [lldb] r278510 - Skip 2 android test what is broken because of debuggerd

[Tamas Berghammer via lldb-commits]

Author: tberghammer
Date: Fri Aug 12 09:17:05 2016
New Revision: 278510

URL: http://llvm.org/viewvc/llvm-project?rev=278510&view=rev
Log:
Skip 2 android test what is broken because of debuggerd

debuggerd is a crash reporting system on android what installs some
signal handler for SEGV to print a backtrace in the log. Its behavior
breaks tests where the test tries to continue after a SEGV so we skip
them as this behavior isn't required on android anyway.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py?rev=278510&r1=278509&r2=278510&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py Fri Aug 12 09:17:05 2016
@@ -49,7 +49,7 @@ class CrashingInferiorTestCase(TestBase)
 
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr24939')
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
-    @expectedFailureAndroid(archs=['aarch64'], api_levels=list(range(21 + 1))) # No eh_frame for sa_restorer
+    @skipIfTargetAndroid() # debuggerd interferes with this test on Android
     def test_inferior_crashing_step_after_break(self):
         """Test that lldb functions correctly after stepping through a crash."""
         self.build()
@@ -190,8 +190,6 @@ class CrashingInferiorTestCase(TestBase)
         expected_state = 'exited' # Provide the exit code.
         if self.platformIsDarwin():
             expected_state = 'stopped' # TODO: Determine why 'next' and 'continue' have no effect after a crash.
-        elif re.match(".*-.*-.*-android", self.dbg.GetSelectedPlatform().GetTriple()):
-            expected_state = 'stopped' # android has a default SEGV handler, which will re-raise the signal, so we come up stopped again
 
         self.expect("next",
             substrs = ['Process', expected_state])

Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py?rev=278510&r1=278509&r2=278510&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py Fri Aug 12 09:17:05 2016
@@ -49,7 +49,7 @@ class CrashingRecursiveInferiorTestCase(
 
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr24939')
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
-    @expectedFailureAndroid(archs=['aarch64'], api_levels=list(range(21 + 1))) # No eh_frame for sa_restorer
+    @skipIfTargetAndroid() # debuggerd interferes with this test on Android
     def test_recursive_inferior_crashing_step_after_break(self):
         """Test that lldb functions correctly after stepping through a crash."""
         self.build()
@@ -187,9 +187,6 @@ class CrashingRecursiveInferiorTestCase(
         expected_state = 'exited' # Provide the exit code.
         if self.platformIsDarwin():
             expected_state = 'stopped' # TODO: Determine why 'next' and 'continue' have no effect after a crash.
-        elif re.match(".*-.*-.*-android", self.dbg.GetSelectedPlatform().GetTriple()):
-            expected_state = 'stopped' # android has a default SEGV handler, which will re-raise the signal, so we come up stopped again
-
 
         self.expect("next",
             substrs = ['Process', expected_state])