From 7129bd8e259206e7a5fe6a06d0507e95ed4955b0 Mon Sep 17 00:00:00 2001 From: Ashok Thirumurthi Date: Fri, 17 May 2013 21:00:56 +0000 Subject: [PATCH] Avoided the use of two test decorators with xfail/xpass logic in the same test. - Used xfail and skip, temporarily, while resolving bugzilla #15671. llvm-svn: 182159 --- .../inferior-assert/TestInferiorAssert.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py index 660b2540e76c..0d4d7b159ec1 100644 --- a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py +++ b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py @@ -15,8 +15,8 @@ class AssertingInferiorTestCase(TestBase): self.buildDsym() self.inferior_asserting() - @expectedFailureLinux(15671, ['clang', 'icc']) # llvm.org/pr15671 - backtrace does not include the assert site - @expectedFailureGcc(15671, ['>=', '4.6.3']) # avoid an xpass on the buildbots where libc was not built with -fomit-frame-pointer + @skipIfGcc # avoid an xpass on the buildbots where libc was not built with -fomit-frame-pointer + @expectedFailureLinux # llvm.org/pr15671 - backtrace does not include the assert site def test_inferior_asserting_dwarf(self): """Test that lldb reliably catches the inferior asserting (command).""" self.buildDwarf() @@ -45,8 +45,8 @@ class AssertingInferiorTestCase(TestBase): self.buildDsym() self.inferior_asserting_expr() - @expectedFailureLinux(15671, ['clang', 'icc']) # llvm.org/pr15671 - backtrace does not include the assert site - @expectedFailureGcc(15671, ['>=', '4.6.3']) # avoid an xpass on the buildbots where libc was not built with -fomit-frame-pointer + @skipIfGcc # avoid an xpass on the buildbots where libc was not built with -fomit-frame-pointer + @expectedFailureLinux # llvm.org/pr15671 - backtrace does not include the assert site def test_inferior_asserting_expr(self): """Test that the lldb expression interpreter can read from the inferior after asserting (command).""" self.buildDwarf() @@ -58,8 +58,8 @@ class AssertingInferiorTestCase(TestBase): self.buildDsym() self.inferior_asserting_step() - @expectedFailureLinux(15671, ['clang', 'icc']) # llvm.org/pr15671 - backtrace does not include the assert site - @expectedFailureGcc(15671, ['>=', '4.6.3']) # avoid an xpass on the buildbots where libc was not built with -fomit-frame-pointer + @skipIfGcc # avoid an xpass on the buildbots where libc was not built with -fomit-frame-pointer + @expectedFailureLinux # llvm.org/pr15671 - backtrace does not include the assert site def test_inferior_asserting_step(self): """Test that lldb functions correctly after stepping through a call to assert().""" self.buildDwarf()