Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[lldb] Adjust skips on reverse continue tests #133240

Merged
merged 1 commit into from
Mar 28, 2025
Merged

Conversation

labath
Copy link
Collaborator

@labath labath commented Mar 27, 2025

The x86-specific issue has been fixed with #132122. Watchpoint tests fail on aarch64 with macos<15.0 due to a kernel bug.

The x86-specific issue has been fixed with llvm#132122. Watchpoint tests
fail on aarch64 with macos<15.0 due to a kernel bug.
@labath labath requested a review from jasonmolenda March 27, 2025 12:06
@labath labath requested a review from JDevlieghere as a code owner March 27, 2025 12:06
@llvmbot llvmbot added the lldb label Mar 27, 2025
@llvmbot
Copy link
Member

llvmbot commented Mar 27, 2025

@llvm/pr-subscribers-lldb

Author: Pavel Labath (labath)

Changes

The x86-specific issue has been fixed with #132122. Watchpoint tests fail on aarch64 with macos<15.0 due to a kernel bug.


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

2 Files Affected:

  • (modified) lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py (-8)
  • (modified) lldb/test/API/functionalities/reverse-execution/TestReverseContinueWatchpoints.py (+8-4)
diff --git a/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py b/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py
index a159e0f716dbe..0a5f2d88fb917 100644
--- a/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py
+++ b/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py
@@ -10,12 +10,10 @@
 
 class TestReverseContinueBreakpoints(ReverseTestBase):
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
     def test_reverse_continue(self):
         self.reverse_continue_internal(async_mode=False)
 
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
     def test_reverse_continue_async(self):
         self.reverse_continue_internal(async_mode=True)
 
@@ -44,12 +42,10 @@ def reverse_continue_internal(self, async_mode):
         self.assertEqual(process.GetExitStatus(), 0)
 
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
     def test_reverse_continue_breakpoint(self):
         self.reverse_continue_breakpoint_internal(async_mode=False)
 
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
     def test_reverse_continue_breakpoint_async(self):
         self.reverse_continue_breakpoint_internal(async_mode=True)
 
@@ -67,12 +63,10 @@ def reverse_continue_breakpoint_internal(self, async_mode):
         self.assertEqual(threads_now, initial_threads)
 
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
     def test_reverse_continue_skip_breakpoint(self):
         self.reverse_continue_skip_breakpoint_internal(async_mode=False)
 
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
     def test_reverse_continue_skip_breakpoint_async(self):
         self.reverse_continue_skip_breakpoint_internal(async_mode=True)
 
@@ -97,12 +91,10 @@ def reverse_continue_skip_breakpoint_internal(self, async_mode):
         )
 
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
     def test_continue_preserves_direction(self):
         self.continue_preserves_direction_internal(async_mode=False)
 
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
     def test_continue_preserves_direction_asyhc(self):
         self.continue_preserves_direction_internal(async_mode=True)
 
diff --git a/lldb/test/API/functionalities/reverse-execution/TestReverseContinueWatchpoints.py b/lldb/test/API/functionalities/reverse-execution/TestReverseContinueWatchpoints.py
index c942f2a0386e5..a9e1bec5750e7 100644
--- a/lldb/test/API/functionalities/reverse-execution/TestReverseContinueWatchpoints.py
+++ b/lldb/test/API/functionalities/reverse-execution/TestReverseContinueWatchpoints.py
@@ -10,12 +10,14 @@
 
 class TestReverseContinueWatchpoints(ReverseTestBase):
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
+    # Watchpoints don't work in single-step mode
+    @skipIf(macos_version=["<", "15.0"], archs=["arm64"])
     def test_reverse_continue_watchpoint(self):
         self.reverse_continue_watchpoint_internal(async_mode=False)
 
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
+    # Watchpoints don't work in single-step mode
+    @skipIf(macos_version=["<", "15.0"], archs=["arm64"])
     def test_reverse_continue_watchpoint_async(self):
         self.reverse_continue_watchpoint_internal(async_mode=True)
 
@@ -60,12 +62,14 @@ def reverse_continue_watchpoint_internal(self, async_mode):
         )
 
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
+    # Watchpoints don't work in single-step mode
+    @skipIf(macos_version=["<", "15.0"], archs=["arm64"])
     def test_reverse_continue_skip_watchpoint(self):
         self.reverse_continue_skip_watchpoint_internal(async_mode=False)
 
     @skipIfRemote
-    @skipIf(macos_version=["<", "15.0"])
+    # Watchpoints don't work in single-step mode
+    @skipIf(macos_version=["<", "15.0"], archs=["arm64"])
     def test_reverse_continue_skip_watchpoint_async(self):
         self.reverse_continue_skip_watchpoint_internal(async_mode=True)
 

Copy link
Member

@JDevlieghere JDevlieghere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, we discussed this yesterday with @rocallahan

Copy link
Collaborator

@jasonmolenda jasonmolenda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@DavidSpickett DavidSpickett merged commit b82fd71 into llvm:main Mar 28, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants