Remove decorators related to debug info types.

All existing usages were ported over to the common decorators.

llvm-svn: 260290

lldb/packages/Python/lldbsuite/test/decorators.py

@@ -291,15 +291,6 @@ def not_remote_testsuite_ready(func):
         return "Not ready for remote testsuite" if lldb.remote_platform else None
     return skipTestIfFn(is_remote)(func)
 
-def expectedFailureDwarf(bugnumber=None):
-    return expectedFailureAll(bugnumber=bugnumber, debug_info="dwarf")
-
-def expectedFailureDwo(bugnumber=None):
-    return expectedFailureAll(bugnumber=bugnumber, debug_info="dwo")
-
-def expectedFailureDsym(bugnumber=None):
-    return expectedFailureAll(bugnumber=bugnumber, debug_info="dsym")
-
 def expectedFailureOS(oslist, bugnumber=None, compilers=None, debug_info=None, archs=None):
     return expectedFailureAll(oslist=oslist, bugnumber=bugnumber, compiler=compilers, archs=archs, debug_info=debug_info)
 
@@ -519,18 +510,6 @@ def skipUnlessPlatform(oslist):
                                 "requires on of %s" % (", ".join(oslist)))
 
 
-def skipIfDebugInfo(bugnumber=None, debug_info=None):
-    return skipIf(bugnumber=bugnumber, debug_info=debug_info)
-
-def skipIfDWO(bugnumber=None):
-    return skipIfDebugInfo(bugnumber, ["dwo"])
-
-def skipIfDwarf(bugnumber=None):
-    return skipIfDebugInfo(bugnumber, ["dwarf"])
-
-def skipIfDsym(bugnumber=None):
-    return skipIfDebugInfo(bugnumber, ["dsym"])
-
 def skipIfGcc(func):
     """Decorate the item to skip tests that should be skipped if building with gcc ."""
     return skipIf(compiler="gcc")(func)

lldb/packages/Python/lldbsuite/test/expression_command/macros/TestMacros.py

@@ -11,7 +11,7 @@ class TestMacros(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(compiler="clang", bugnumber="clang does not emit .debug_macro[.dwo] sections.")
-    @expectedFailureDwo("GCC produces multiple .debug_macro.dwo sections and the spec is unclear as to what it means")
+    @expectedFailureAll(debug_info="dwo", bugnumber="GCC produces multiple .debug_macro.dwo sections and the spec is unclear as to what it means")
     @expectedFailureAll(hostoslist=["windows"], compiler="gcc", triple='.*-android')
     def test_expr_with_macros(self):
         self.build()

lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py

@@ -17,7 +17,7 @@ class DeadStripTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
-    @expectedFailureDwo("llvm.org/pr25087")
+    @expectedFailureAll(debug_info="dwo", bugnumber="llvm.org/pr25087")
     @skipIfFreeBSD # The -dead_strip linker option isn't supported on FreeBSD versions of ld.
     def test(self):
         """Test breakpoint works correctly with dead-code stripping."""

lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py

@@ -29,8 +29,7 @@ class HiddenIvarsTestCase(TestBase):
         self.shlib_names = ["InternalDefiner"]
 
     @skipUnlessDarwin
-    @skipIfDwarf    # This test requires a stripped binary and a dSYM
-    @skipIfDWO      # This test requires a stripped binary and a dSYM
+    @skipIf(debug_info=no_match("dsym"), bugnumber="This test requires a stripped binary and a dSYM")
     def test_expr_stripped(self):
         if self.getArchitecture() == 'i386':
             self.skipTest("requires modern objc runtime")
@@ -47,8 +46,7 @@ class HiddenIvarsTestCase(TestBase):
             self.expr(False)
 
     @skipUnlessDarwin
-    @skipIfDwarf    # This test requires a stripped binary and a dSYM
-    @skipIfDWO      # This test requires a stripped binary and a dSYM
+    @skipIf(debug_info=no_match("dsym"), bugnumber="This test requires a stripped binary and a dSYM")
     def test_frame_variable_stripped(self):
         if self.getArchitecture() == 'i386':
             self.skipTest("requires modern objc runtime")

lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py

@@ -22,8 +22,7 @@ class TestObjCIvarStripped(TestBase):
         self.stop_line = line_number(self.main_source, '// Set breakpoint here.')
 
     @skipUnlessDarwin
-    @skipIfDwarf    # This test requires a stripped binary and a dSYM
-    @skipIfDWO      # This test requires a stripped binary and a dSYM
+    @skipIf(debug_info=no_match("dsym"), bugnumber="This test requires a stripped binary and a dSYM")
     @add_test_categories(['pyapi'])
     def test_with_python_api(self):
         """Test that we can find stripped Objective-C ivars in the runtime"""

lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py

@@ -23,8 +23,7 @@ class TestObjCStaticMethodStripped(TestBase):
 
     @skipUnlessDarwin
     @add_test_categories(['pyapi'])
-    @skipIfDwarf    # This test requires a stripped binary and a dSYM
-    @skipIfDWO      # This test requires a stripped binary and a dSYM
+    @skipIf(debug_info=no_match("dsym"), bugnumber="This test requires a stripped binary and a dSYM")
     #<rdar://problem/12042992>
     def test_with_python_api(self):
         """Test calling functions in static methods with a stripped binary."""