[Lldb-commits] [lldb] 1c90ce0 - [lldb/Test] Disable hardware check on arm/aarch64

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2020-01-24T20:54:18-08:00
New Revision: 1c90ce0c761719ab58361402fb85c0b58680832b

URL: https://github.com/llvm/llvm-project/commit/1c90ce0c761719ab58361402fb85c0b58680832b
DIFF: https://github.com/llvm/llvm-project/commit/1c90ce0c761719ab58361402fb85c0b58680832b.diff

LOG: [lldb/Test] Disable hardware check on arm/aarch64

BreakpointSites know they're backed by hardware based on whether the
"hardware index" is set. This does not appear the to be done for
arm/aarch64.

https://llvm.org/PR44659

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
index f9a916f87b86..90d182bfcc89 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
@@ -21,7 +21,7 @@ class HardwareBreakpointMultiThreadTestCase(TestBase):
     def test_hw_break_set_delete_multi_thread_linux(self):
         self.build()
         self.setTearDownCleanup()
-        self.break_multi_thread('delete')
+        self.break_multi_thread('delete', False) # llvm.org/PR44659
 
     # LLDB on linux supports hardware breakpoints for arm and aarch64
     # architectures.
@@ -30,7 +30,7 @@ def test_hw_break_set_delete_multi_thread_linux(self):
     def test_hw_break_set_disable_multi_thread_linux(self):
         self.build()
         self.setTearDownCleanup()
-        self.break_multi_thread('disable')
+        self.break_multi_thread('disable', False) # llvm.org/PR44659
 
     # LLDB on darwin supports hardware breakpoints for arm, aarch64, x86_64 and
     # i386 architectures.
@@ -60,7 +60,7 @@ def setUp(self):
         self.first_stop = line_number(
             self.source, 'Starting thread creation with hardware breakpoint set')
 
-    def break_multi_thread(self, removal_type):
+    def break_multi_thread(self, removal_type, check_hw_bp=True):
         """Test that lldb hardware breakpoints work for multiple threads."""
         self.runCmd("file " + self.getBuildArtifact("a.out"),
                     CURRENT_EXECUTABLE_SET)
@@ -101,9 +101,10 @@ def break_multi_thread(self, removal_type):
             # Continue the loop and test that we are stopped 4 times.
             count += 1
 
-        # Check the breakpoint list.
-        self.expect("breakpoint list", substrs=['hw_break_function', 'hardware'])
-        self.expect("breakpoint list -v", substrs=['function = hw_break_function', 'hardware = true'])
+        if check_hw_bp:
+            # Check the breakpoint list.
+            self.expect("breakpoint list", substrs=['hw_break_function', 'hardware'])
+            self.expect("breakpoint list -v", substrs=['function = hw_break_function', 'hardware = true'])
 
         if removal_type == 'delete':
             self.runCmd("settings set auto-confirm true")