[lldb] Fix a test if hardware breakpoints are not supported

[igorkudrin]

If HardwareBreakpointTestBase.supports_hw_breakpoints() returns False, SimpleHWBreakpointTest.does_not_support_hw_breakpoints() returns None, so the test runs and fails. However, it should be skipped instead.

The test was added in #146602, while supports_hw_breakpoints() was changed in #146609, which was landed earlier despite having a bigger number.

[llvmbot]

@llvm/pr-subscribers-lldb

Author: Igor Kudrin (igorkudrin)

Changes

If HardwareBreakpointTestBase.supports_hw_breakpoints() returns False, SimpleHWBreakpointTest.does_not_support_hw_breakpoints() returns None, so the test runs and fails. However, it should be skipped instead.

The test was added in #146602, while supports_hw_breakpoints() was changed in #146609, which was landed earlier despite having a bigger number.

---

Full diff: https://github.com/llvm/llvm-project/pull/168813.diff

1 Files Affected:

• (modified) lldb/test/API/functionalities/breakpoint/hardware_breakpoints/simple_hw_breakpoints/TestSimpleHWBreakpoints.py (+11-20)

diff --git a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/simple_hw_breakpoints/TestSimpleHWBreakpoints.py b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/simple_hw_breakpoints/TestSimpleHWBreakpoints.py
index ccbb23507c1be..acf75df6711cd 100644
--- a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/simple_hw_breakpoints/TestSimpleHWBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/simple_hw_breakpoints/TestSimpleHWBreakpoints.py
@@ -7,13 +7,7 @@
 
 
 class SimpleHWBreakpointTest(HardwareBreakpointTestBase):
-    def does_not_support_hw_breakpoints(self):
-        # FIXME: Use HardwareBreakpointTestBase.supports_hw_breakpoints
-        if super().supports_hw_breakpoints() is None:
-            return "Hardware breakpoints are unsupported"
-        return None
-
-    @skipTestIfFn(does_not_support_hw_breakpoints)
+    @skipTestIfFn(HardwareBreakpointTestBase.hw_breakpoints_unsupported)
     def test(self):
         """Test SBBreakpoint::SetIsHardware"""
         self.build()
@@ -35,16 +29,13 @@ def test(self):
         # breakpoint will be marked as a hardware breakpoint.
         self.assertTrue(break_on_me_bp.IsHardware())
 
-        if super().supports_hw_breakpoints():
-            self.assertSuccess(error)
-
-            # Continue to our Hardware breakpoint and verify that's the reason
-            # we're stopped.
-            process.Continue()
-            self.expect(
-                "thread list",
-                STOPPED_DUE_TO_BREAKPOINT,
-                substrs=["stopped", "stop reason = breakpoint"],
-            )
-        else:
-            self.assertFailure(error)
+        self.assertSuccess(error)
+
+        # Continue to our Hardware breakpoint and verify that's the reason
+        # we're stopped.
+        process.Continue()
+        self.expect(
+            "thread list",
+            STOPPED_DUE_TO_BREAKPOINT,
+            substrs=["stopped", "stop reason = breakpoint"],
+        )

[github-actions]

🐧 Linux x64 Test Results

• 33162 tests passed
• 495 tests skipped

[DavidSpickett]

LGTM.