[lldb][test][FreeBSD] Fix some concurrent event tests #84155
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A lot of `TestConcurrent*.py` expect one of the threads to crash, but we weren't checking for it properly. Possibly because signal reporting got better on FreeBSD at some point, and it now shows the same info as Linux does. ``` lldb-api :: functionalities/inferior-changed/TestInferiorChanged.py lldb-api :: functionalities/inferior-crashing/TestInferiorCrashing.py lldb-api :: functionalities/inferior-crashing/TestInferiorCrashingStep.py lldb-api :: functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py lldb-api :: functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py lldb-api :: functionalities/thread/concurrent_events/TestConcurrentCrashWithBreak.py lldb-api :: functionalities/thread/concurrent_events/TestConcurrentCrashWithSignal.py lldb-api :: functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpoint.py lldb-api :: functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpointBreakpointSignal.py ``` Fixes llvm#48777 `TestConcurrentTwoBreakpointsOneSignal.py` no longer fails, at least on an AWS instance, so I've removed the xfail there.
|
@llvm/pr-subscribers-lldb Author: David Spickett (DavidSpickett) ChangesA lot of Possibly because signal reporting got better on FreeBSD at some point, and it now shows the same info as Linux does. Fixes #48777
Full diff: https://github.com/llvm/llvm-project/pull/84155.diff 2 Files Affected:
diff --git a/lldb/packages/Python/lldbsuite/test/lldbutil.py b/lldb/packages/Python/lldbsuite/test/lldbutil.py
index 58eb37fd742d73..32f52ec6c0f538 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbutil.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbutil.py
@@ -809,7 +809,7 @@ def is_thread_crashed(test, thread):
thread.GetStopReason() == lldb.eStopReasonException
and "EXC_BAD_ACCESS" in thread.GetStopDescription(100)
)
- elif test.getPlatform() == "linux":
+ elif test.getPlatform() in ["linux", "freebsd"]:
return (
thread.GetStopReason() == lldb.eStopReasonSignal
and thread.GetStopReasonDataAtIndex(0)
diff --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py
index c66905af9e92df..4960c4b241fb8b 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py
@@ -8,9 +8,6 @@ class ConcurrentTwoBreakpointsOneSignal(ConcurrentEventsBase):
# Atomic sequences are not supported yet for MIPS in LLDB.
@skipIf(triple="^mips")
@expectedFlakeyNetBSD
- @expectedFailureAll(
- archs=["aarch64"], oslist=["freebsd"], bugnumber="llvm.org/pr49433"
- )
def test(self):
"""Test two threads that trigger a breakpoint and one signal thread."""
self.build()
|
|
This assumes that Jim's patch (https://reviews.llvm.org/D129814) fixed the TestConcurrentTwoBreakpointsOneSignal issue, and not the fact that I'm using an AWS instance instead of QEMU. I can remove that change if it seems like a risk. |
emaste
approved these changes
May 1, 2024
|
Yes I think it's likely fixed. I'll give it a try on my FreeBSD laptop shortly. |
|
Ok for me to land this or are you still going to check them locally? |
|
I'm going to go ahead and land this, don't hesitate to revert if there are still problems. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A lot of
TestConcurrent*.pyexpect one of the threads to crash, but we weren't checking for it properly.Possibly because signal reporting got better on FreeBSD at some point, and it now shows the same info as Linux does.
Fixes #48777
TestConcurrentTwoBreakpointsOneSignal.pyno longer fails, at least on an AWS instance, so I've removed the xfail there.