[lldb] Mark several tests as not dependent on debug info

Summary: This just adds `NO_DEBUG_INFO_TESTCASE` to tests that don't really exercise anything debug information specific and therefore don't need to be rerun for all debug information variants. Reviewers: labath, jingham, aprantl, mib, jfb Reviewed By: aprantl Subscribers: dexonsmith, JDevlieghere, lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D72447
2020-01-13 10:00:06 +01:00 · 2020-01-13 10:00:06 +01:00 · ddf044290e
parent 3cad8ada49
commit ddf044290e
40 changed files with 42 additions and 39 deletions
--- a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py
@ -12,6 +12,7 @@ import lldbsuite.test.lldbutil as lldbutil
 class AproposWithProcessTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py
@ -12,6 +12,7 @@ import lldbsuite.test.lldbutil as lldbutil
 class NestedAliasTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py
@ -11,6 +11,7 @@ from lldbsuite.test.lldbtest import *
 class CommandScriptAliasTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def test_pycmd(self):
        self.runCmd("command script import tcsacmd.py")
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py
@ -13,6 +13,7 @@ from lldbsuite.test import lldbutil
 class TestCalculatorMode(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def test__calculator_mode(self):
        """Test calling expressions in the dummy target."""
--- a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py
@ -15,6 +15,7 @@ exe_name = "AttachResume"  # Must match Makefile
 class AttachResumeTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    @skipIfRemote
    @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr19310')
--- a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
@ -13,6 +13,7 @@ from lldbsuite.test import lldbutil
 class LaunchWithShellExpandTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    @expectedFailureAll(
        oslist=[
--- a/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/TestStats.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/TestStats.py
@ -2,4 +2,4 @@ from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators

 lldbinline.MakeInlineTest(
-    __file__, globals(), [])
+    __file__, globals(), [decorators.no_debug_info_test])
--- a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py
@ -11,6 +11,7 @@ import lldbsuite.test.lldbutil as lldbutil
 class NoSuchArchTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def test(self):
        self.build()
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
@ -14,6 +14,7 @@ from lldbsuite.test import lldbutil
 class HelloWatchLocationTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
@ -13,6 +13,7 @@ from lldbsuite.test import lldbutil
 class HelloWatchpointTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
@ -11,6 +11,7 @@ from lldbsuite.test import lldbutil
 class TestStepOverWatchpoint(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    @expectedFailureAll(
        oslist=["linux"],
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
@ -14,6 +14,7 @@ from lldbsuite.test.decorators import *
 class WatchedVariableHitWhenInScopeTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    # This test depends on not tracking watchpoint expression hits if we have
    # left the watchpoint scope.  We will provide such an ability at some point
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
@ -13,6 +13,7 @@ from lldbsuite.test import lldbutil
 class WatchpointCommandsTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
@ -13,6 +13,7 @@ from lldbsuite.test import lldbutil
 class WatchpointLLDBCommandTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
@ -14,6 +14,7 @@ from lldbsuite.test import lldbutil
 class WatchpointPythonCommandTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
@ -13,6 +13,7 @@ from lldbsuite.test import lldbutil
 class WatchpointConditionCmdTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
@ -10,6 +10,7 @@ from lldbsuite.test import lldbplatform, lldbplatformutil

 class TestWatchpointSetEnable(TestBase):
    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def test_disable_works (self):
        """Set a watchpoint, disable it, and make sure it doesn't get hit."""
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
@ -12,6 +12,7 @@ from lldbsuite.test import lldbutil
 class TestWatchpointEvents (TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
@ -13,6 +13,7 @@ from lldbsuite.test import lldbutil
 class TestValueOfVectorVariableTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def test_value_of_vector_variable_using_watchpoint_set(self):
        """Test verify displayed value of vector variable."""
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
@ -13,6 +13,7 @@ from lldbsuite.test import lldbutil
 class WatchLocationUsingWatchpointSetTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/TestOffsetof.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/TestOffsetof.py
@ -1,3 +1,4 @@
 from lldbsuite.test import lldbinline
+from lldbsuite.test import decorators

-lldbinline.MakeInlineTest(__file__, globals())
+lldbinline.MakeInlineTest(__file__, globals(), [decorators.no_debug_info_test])
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/TestOffsetofCpp.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/TestOffsetofCpp.py
@ -1,3 +1,4 @@
 from lldbsuite.test import lldbinline
+from lldbsuite.test import decorators

-lldbinline.MakeInlineTest(__file__, globals())
+lldbinline.MakeInlineTest(__file__, globals(), [decorators.no_debug_info_test])
--- a/lldb/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
@ -12,9 +12,9 @@ from lldbsuite.test import lldbutil
 class DebuggerAPITestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_debugger_api_boundary_condition(self):
        """Exercise SBDebugger APIs with boundary conditions."""
        self.dbg.HandleCommand(None)
--- a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
@ -23,9 +23,9 @@ from lldbsuite.test import lldbutil
 class APIDefaultConstructorTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBAddress(self):
        obj = lldb.SBAddress()
        if self.TraceOn():
@ -36,7 +36,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_address.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBBlock(self):
        obj = lldb.SBBlock()
        if self.TraceOn():
@ -47,7 +46,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_block.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBBreakpoint(self):
        obj = lldb.SBBreakpoint()
        if self.TraceOn():
@ -58,7 +56,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_breakpoint.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBBreakpointLocation(self):
        obj = lldb.SBBreakpointLocation()
        if self.TraceOn():
@ -69,7 +66,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_breakpointlocation.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBBreakpointName(self):
        obj = lldb.SBBreakpointName()
        if self.TraceOn():
@ -80,7 +76,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_breakpointname.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBBroadcaster(self):
        obj = lldb.SBBroadcaster()
        if self.TraceOn():
@ -91,7 +86,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_broadcaster.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBCommandReturnObject(self):
        """SBCommandReturnObject object is valid after default construction."""
        obj = lldb.SBCommandReturnObject()
@ -100,7 +94,6 @@ class APIDefaultConstructorTestCase(TestBase):
        self.assertTrue(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBCommunication(self):
        obj = lldb.SBCommunication()
        if self.TraceOn():
@ -111,7 +104,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_communication.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBCompileUnit(self):
        obj = lldb.SBCompileUnit()
        if self.TraceOn():
@ -122,7 +114,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_compileunit.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBDebugger(self):
        obj = lldb.SBDebugger()
        if self.TraceOn():
@ -133,7 +124,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_debugger.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    # darwin: This test passes with swig 3.0.2, fails w/3.0.5 other tests fail
    # with 2.0.12 http://llvm.org/pr23488
    def test_SBError(self):
@ -146,7 +136,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_error.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBEvent(self):
        obj = lldb.SBEvent()
        # This is just to test that typemap, as defined in lldb.swig, works.
@ -171,7 +160,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_filespec.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBFrame(self):
        obj = lldb.SBFrame()
        if self.TraceOn():
@ -182,7 +170,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_frame.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBFunction(self):
        obj = lldb.SBFunction()
        if self.TraceOn():
@ -193,7 +180,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_function.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBFile(self):
        sbf = lldb.SBFile()
        self.assertFalse(sbf.IsValid())
@ -207,7 +193,6 @@ class APIDefaultConstructorTestCase(TestBase):
        self.assertTrue(e.Fail())

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBInstruction(self):
        obj = lldb.SBInstruction()
        if self.TraceOn():
@ -218,7 +203,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_instruction.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBInstructionList(self):
        obj = lldb.SBInstructionList()
        if self.TraceOn():
@ -229,7 +213,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_instructionlist.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBLineEntry(self):
        obj = lldb.SBLineEntry()
        if self.TraceOn():
@ -240,7 +223,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_lineentry.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBListener(self):
        obj = lldb.SBListener()
        if self.TraceOn():
@ -251,7 +233,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_listener.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    # Py3 asserts due to a bug in SWIG.  Trying to upstream a patch to fix
    # this in 3.0.8
    @skipIf(py_version=['>=', (3, 0)], swig_version=['<', (3, 0, 8)])
@ -265,7 +246,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_module.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBProcess(self):
        obj = lldb.SBProcess()
        if self.TraceOn():
@ -276,7 +256,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_process.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBProcessInfo(self):
        obj = lldb.SBProcessInfo()
        if self.TraceOn():
@ -287,7 +266,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_process_info.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBSection(self):
        obj = lldb.SBSection()
        if self.TraceOn():
@ -298,7 +276,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_section.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBStream(self):
        """SBStream object is valid after default construction."""
        obj = lldb.SBStream()
@ -307,7 +284,6 @@ class APIDefaultConstructorTestCase(TestBase):
        self.assertTrue(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBStringList(self):
        obj = lldb.SBStringList()
        if self.TraceOn():
@ -318,7 +294,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_stringlist.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBSymbol(self):
        obj = lldb.SBSymbol()
        if self.TraceOn():
@ -329,7 +304,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_symbol.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBSymbolContext(self):
        obj = lldb.SBSymbolContext()
        if self.TraceOn():
@ -340,7 +314,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_symbolcontext.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBSymbolContextList(self):
        """SBSymbolContextList object is valid after default construction."""
        obj = lldb.SBSymbolContextList()
@ -349,7 +322,6 @@ class APIDefaultConstructorTestCase(TestBase):
        self.assertTrue(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBTarget(self):
        obj = lldb.SBTarget()
        if self.TraceOn():
@ -360,7 +332,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_target.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBThread(self):
        obj = lldb.SBThread()
        if self.TraceOn():
@ -371,7 +342,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_thread.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBType(self):
        try:
            obj = lldb.SBType()
@ -390,7 +360,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_type.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBTypeList(self):
        """SBTypeList object is valid after default construction."""
        obj = lldb.SBTypeList()
@ -399,7 +368,6 @@ class APIDefaultConstructorTestCase(TestBase):
        self.assertTrue(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBValue(self):
        obj = lldb.SBValue()
        if self.TraceOn():
@ -410,7 +378,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_value.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBValueList(self):
        obj = lldb.SBValueList()
        if self.TraceOn():
@ -421,7 +388,6 @@ class APIDefaultConstructorTestCase(TestBase):
        sb_valuelist.fuzz_obj(obj)

    @add_test_categories(['pyapi'])
-    @no_debug_info_test
    def test_SBWatchpoint(self):
        obj = lldb.SBWatchpoint()
        if self.TraceOn():
--- a/lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
@ -17,6 +17,7 @@ from lldbsuite.test import lldbutil
 class EventAPITestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
@ -11,6 +11,7 @@ from lldbsuite.test import lldbutil
 class SBFrameFindValueTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    @add_test_categories(['pyapi'])
    def test_formatters_api(self):
--- a/lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
@ -12,6 +12,7 @@ from lldbsuite.test import lldbutil
 class SBFormattersAPITestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
@ -14,6 +14,7 @@ from lldbsuite.test.lldbutil import get_stopped_thread, state_type_to_str
 class ProcessAPITestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
@ -13,6 +13,7 @@ from lldbsuite.test import lldbutil
 class ProcessIOTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setup_test(self):
        # Get the full path to our executable to be debugged.
--- a/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
@ -13,6 +13,7 @@ class Radar12481949DataFormatterTestCase(TestBase):

    # test for rdar://problem/12481949
    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
@ -12,6 +12,7 @@ from lldbsuite.test import lldbutil
 class SBDataAPICase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
@ -11,6 +11,7 @@ from lldbsuite.test import lldbutil
 class SBValuePersistTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    @add_test_categories(['pyapi'])
    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24772")
--- a/lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
@ -13,6 +13,7 @@ from lldbsuite.test.lldbutil import get_stopped_thread, state_type_to_str

 class SignalsAPITestCase(TestBase):
    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    @add_test_categories(['pyapi'])
    @skipIfWindows  # Windows doesn't have signals
--- a/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
@ -15,6 +15,7 @@ from lldbsuite.test import lldbutil
 class ValueAsLinkedListTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
@ -14,6 +14,7 @@ from lldbsuite.test import lldbutil
 class SetWatchpointAPITestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
@ -14,6 +14,7 @@ from lldbsuite.test import lldbutil
 class WatchpointIgnoreCountTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
@ -15,6 +15,7 @@ from lldbsuite.test import lldbutil
 class WatchpointIteratorTestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    # hardware watchpoints are not reported with a hardware index # on armv7 on ios devices
    def affected_by_radar_34564183(self):
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
@ -14,6 +14,7 @@ from lldbsuite.test import lldbutil
 class WatchpointConditionAPITestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
@ -15,6 +15,7 @@ from lldbsuite.test import lldbutil
 class SetWatchlocationAPITestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
@ -14,6 +14,7 @@ from lldbsuite.test import lldbutil
 class TargetWatchAddressAPITestCase(TestBase):

    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True

    def setUp(self):
        # Call super's setUp().