From 3785393def95f2b52ef28e9bcb3985066812d2db Mon Sep 17 00:00:00 2001 From: Tamas Berghammer Date: Fri, 12 Aug 2016 14:17:05 +0000 Subject: [PATCH] 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. llvm-svn: 278510 --- .../test/functionalities/inferior-crashing/TestInferiorCrashing.py | 4 +--- .../inferior-crashing/recursive-inferior/TestRecursiveInferior.py | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py index fd6a9ab..f6d79ca 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py @@ -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]) diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py index 0d1992d..82e55a5 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py @@ -49,7 +49,7 @@ class CrashingRecursiveInferiorTestCase(TestBase): @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(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]) -- 2.7.4