[lldb][NFC] Remove old skipIfOutOfTreeDebugserver's #126144
Merged
Conversation
This file contains hidden or 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
When a test depends on a new debugserver feature/fix, the API test must be marked @skipIfOutOfTreeDebugserver because the macOS CI bots test using the latest Xcode release debugserver. But over time all of these fixes & new features are picked up in the Xcode debugserver and these skips can be removed. We may see unexpected test failures from removing all of these 1+ year old skips, but that's likely a separate reason the test is failing that is being papered over by this skip.
|
@llvm/pr-subscribers-lldb Author: Jason Molenda (jasonmolenda) ChangesWhen a test depends on a new debugserver feature/fix, the API test must be marked @skipIfOutOfTreeDebugserver because the macOS CI bots test using the latest Xcode release debugserver. But over time all of these fixes & new features are picked up in the Xcode debugserver and these skips can be removed. We may see unexpected test failures from removing all of these 1+ year old skips, but that's likely a separate reason the test is failing that is being papered over by this skip. Full diff: https://github.com/llvm/llvm-project/pull/126144.diff 20 Files Affected:
diff --git a/lldb/test/API/commands/register/register/register_command/TestRegisters.py b/lldb/test/API/commands/register/register/register_command/TestRegisters.py
index 99290e02cd2b04f..5bf7aa5dee9c4a8 100644
--- a/lldb/test/API/commands/register/register/register_command/TestRegisters.py
+++ b/lldb/test/API/commands/register/register/register_command/TestRegisters.py
@@ -111,7 +111,6 @@ def test_fp_register_write(self):
# "register read fstat" always return 0xffff
@expectedFailureAndroid(archs=["i386"])
@skipIf(archs=no_match(["amd64", "i386", "x86_64"]))
- @skipIfOutOfTreeDebugserver
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr37995")
def test_fp_special_purpose_register_read(self):
"""Test commands that read fpu special purpose registers."""
diff --git a/lldb/test/API/commands/watchpoints/unaligned-watchpoint/TestUnalignedWatchpoint.py b/lldb/test/API/commands/watchpoints/unaligned-watchpoint/TestUnalignedWatchpoint.py
index 68f239668cf0885..5f9e52855da1688 100644
--- a/lldb/test/API/commands/watchpoints/unaligned-watchpoint/TestUnalignedWatchpoint.py
+++ b/lldb/test/API/commands/watchpoints/unaligned-watchpoint/TestUnalignedWatchpoint.py
@@ -16,7 +16,6 @@
class UnalignedWatchpointTestCase(TestBase):
NO_DEBUG_INFO_TESTCASE = True
- @skipIfOutOfTreeDebugserver
def test_unaligned_watchpoint(self):
"""Test an unaligned watchpoint triggered by a larger aligned write."""
self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
index 6fe74a8a3fb8c94..1a0515aa04c0799 100644
--- a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
+++ b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
@@ -15,14 +15,12 @@ class HardwareBreakpointMultiThreadTestCase(HardwareBreakpointTestBase):
def does_not_support_hw_breakpoints(self):
return not super().supports_hw_breakpoints()
- @skipIfOutOfTreeDebugserver
@skipTestIfFn(does_not_support_hw_breakpoints)
def test_hw_break_set_delete_multi_thread_macos(self):
self.build()
self.setTearDownCleanup()
self.break_multi_thread("delete")
- @skipIfOutOfTreeDebugserver
@skipTestIfFn(does_not_support_hw_breakpoints)
def test_hw_break_set_disable_multi_thread_macos(self):
self.build()
diff --git a/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py b/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py
index bf9681ad678b6df..a5c79378bab50de 100644
--- a/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py
+++ b/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py
@@ -32,7 +32,6 @@ def get_module_with_name(self, target, name):
return None
@skipUnlessDarwin
- @skipIfOutOfTreeDebugserver
@skipIfRemote
@skipIfAsan # On ASAN builds, this test times-out (rdar://98678134)
@skipIfDarwin
diff --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py
index 79e704ac5696232..bc41f5f3045a741 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py
@@ -7,7 +7,6 @@
class ConcurrentManyBreakpoints(ConcurrentEventsBase):
# Atomic sequences are not supported yet for MIPS in LLDB.
@skipIf(triple="^mips")
- @skipIfOutOfTreeDebugserver
@expectedFailureAll(
archs=["aarch64"], oslist=["freebsd"], bugnumber="llvm.org/pr49433"
)
diff --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py
index af841b1dc41e651..c5d5e40986720da 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py
@@ -7,7 +7,6 @@
class ConcurrentManyCrash(ConcurrentEventsBase):
# Atomic sequences are not supported yet for MIPS in LLDB.
@skipIf(triple="^mips")
- @skipIfOutOfTreeDebugserver
def test(self):
"""Test 100 threads that cause a segfault."""
self.build()
diff --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py
index 4d4e6516bf88aa7..d241aa76f61eaef 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py
@@ -10,7 +10,6 @@ class ConcurrentManySignals(ConcurrentEventsBase):
# This test is flaky on Darwin.
@skipIfDarwin
@expectedFailureNetBSD
- @skipIfOutOfTreeDebugserver
def test(self):
"""Test 100 signals from 100 threads."""
self.build()
diff --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py
index 072ec06a5af9405..30b7da4cddb1e8b 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py
@@ -8,7 +8,6 @@ class ConcurrentManyWatchpoints(ConcurrentEventsBase):
# Atomic sequences are not supported yet for MIPS in LLDB.
@skipIf(triple="^mips")
@add_test_categories(["watchpoint"])
- @skipIfOutOfTreeDebugserver
def test(self):
"""Test 100 watchpoints from 100 threads."""
self.build()
diff --git a/lldb/test/API/functionalities/watchpoint/large-watchpoint/TestLargeWatchpoint.py b/lldb/test/API/functionalities/watchpoint/large-watchpoint/TestLargeWatchpoint.py
index c5e161497e6281d..8db242a17feb5bf 100644
--- a/lldb/test/API/functionalities/watchpoint/large-watchpoint/TestLargeWatchpoint.py
+++ b/lldb/test/API/functionalities/watchpoint/large-watchpoint/TestLargeWatchpoint.py
@@ -27,7 +27,6 @@ def continue_and_report_stop_reason(self, process, iter_str):
# debugserver only gained the ability to watch larger regions
# with this patch.
- @skipIfOutOfTreeDebugserver
def test_large_watchpoint(self):
"""Test watchpoint that covers a large region of memory."""
self.build()
diff --git a/lldb/test/API/functionalities/watchpoint/unaligned-spanning-two-dwords/TestUnalignedSpanningDwords.py b/lldb/test/API/functionalities/watchpoint/unaligned-spanning-two-dwords/TestUnalignedSpanningDwords.py
index 9a0f451c64c3026..bf0cb24e2188834 100644
--- a/lldb/test/API/functionalities/watchpoint/unaligned-spanning-two-dwords/TestUnalignedSpanningDwords.py
+++ b/lldb/test/API/functionalities/watchpoint/unaligned-spanning-two-dwords/TestUnalignedSpanningDwords.py
@@ -32,7 +32,6 @@ def hit_watchpoint_and_continue(self, process, iter_str):
# older debugservers will return the base address of the doubleword
# which lldb doesn't understand, and will stop executing without a
# proper stop reason.
- @skipIfOutOfTreeDebugserver
def test_unaligned_watchpoint(self):
"""Test a watchpoint that is handled by two hardware watchpoint registers."""
self.build()
diff --git a/lldb/test/API/macosx/corefile-exception-reason/TestCorefileExceptionReason.py b/lldb/test/API/macosx/corefile-exception-reason/TestCorefileExceptionReason.py
index 58f6c36ccfcc64f..ada74a11ffd7fa1 100644
--- a/lldb/test/API/macosx/corefile-exception-reason/TestCorefileExceptionReason.py
+++ b/lldb/test/API/macosx/corefile-exception-reason/TestCorefileExceptionReason.py
@@ -11,7 +11,6 @@
class TestCorefileExceptionReason(TestBase):
- @skipIfOutOfTreeDebugserver # newer debugserver required for these qMemoryRegionInfo types
@no_debug_info_test
@skipUnlessDarwin
@skipIf(archs=no_match(["arm64", "arm64e"]))
diff --git a/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py b/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py
index 853d5635031f561..2d9c0f5f977737a 100644
--- a/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py
+++ b/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py
@@ -11,7 +11,6 @@
class TestCase(TestBase):
@no_debug_info_test
@skipUnlessDarwin
- @skipIfOutOfTreeDebugserver
def test_abort(self):
self.build()
target = self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
diff --git a/lldb/test/API/macosx/early-process-launch/TestEarlyProcessLaunch.py b/lldb/test/API/macosx/early-process-launch/TestEarlyProcessLaunch.py
index ff704104f7892f7..4c1bbe7490018a3 100644
--- a/lldb/test/API/macosx/early-process-launch/TestEarlyProcessLaunch.py
+++ b/lldb/test/API/macosx/early-process-launch/TestEarlyProcessLaunch.py
@@ -12,7 +12,6 @@ class TestEarlyProcessLaunch(TestBase):
@skipUnlessDarwin
@skipIfAsan # rdar://103359354
- @skipIfOutOfTreeDebugserver # 2022-12-13 FIXME: skipping system debugserver
# until this feature is included in the system
# debugserver.
@add_test_categories(["pyapi"])
diff --git a/lldb/test/API/macosx/ignore_exceptions/TestIgnoredExceptions.py b/lldb/test/API/macosx/ignore_exceptions/TestIgnoredExceptions.py
index 429f1dbb1beba3e..8d2674f7bad3076 100644
--- a/lldb/test/API/macosx/ignore_exceptions/TestIgnoredExceptions.py
+++ b/lldb/test/API/macosx/ignore_exceptions/TestIgnoredExceptions.py
@@ -12,7 +12,6 @@
class TestDarwinSignalHandlers(TestBase):
NO_DEBUG_INFO_TESTCASE = True
- @skipIfOutOfTreeDebugserver
@skipUnlessDarwin
def test_ignored_thread(self):
"""It isn't possible to convert an EXC_BAD_ACCESS to a signal when
diff --git a/lldb/test/API/macosx/profile_vrs_detach/TestDetachVrsProfile.py b/lldb/test/API/macosx/profile_vrs_detach/TestDetachVrsProfile.py
index c2fa837ed01b87d..b558b6215ceda4b 100644
--- a/lldb/test/API/macosx/profile_vrs_detach/TestDetachVrsProfile.py
+++ b/lldb/test/API/macosx/profile_vrs_detach/TestDetachVrsProfile.py
@@ -19,7 +19,6 @@ class TestDetachVrsProfile(TestBase):
NO_DEBUG_INFO_TESTCASE = True
@skipUnlessDarwin
- @skipIfOutOfTreeDebugserver
@skipIfRemote
def test_profile_and_detach(self):
"""There can be many tests in a test case - describe this test here."""
diff --git a/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py b/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
index 3f5645a486bcb41..a69f7a055c79b50 100644
--- a/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
+++ b/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
@@ -79,7 +79,6 @@ def run_with(self, arch, os, vers, env, expected_load_command):
@skipUnlessDarwin
@skipIfDarwinEmbedded
@apple_simulator_test("iphone")
- @skipIfOutOfTreeDebugserver
def test_ios(self):
"""Test running an iOS simulator binary"""
self.run_with(
@@ -94,7 +93,6 @@ def test_ios(self):
@skipUnlessDarwin
@skipIfDarwinEmbedded
@apple_simulator_test("appletv")
- @skipIfOutOfTreeDebugserver
def test_tvos(self):
"""Test running an tvOS simulator binary"""
self.run_with(
@@ -111,7 +109,6 @@ def test_tvos(self):
@apple_simulator_test("watch")
@skipIfDarwin # rdar://problem/64552748
@skipIf(archs=["arm64", "arm64e"])
- @skipIfOutOfTreeDebugserver
def test_watchos_i386(self):
"""Test running a 32-bit watchOS simulator binary"""
self.run_with(
@@ -128,7 +125,6 @@ def test_watchos_i386(self):
@apple_simulator_test("watch")
@skipIfDarwin # rdar://problem/64552748
@skipIf(archs=["i386", "x86_64"])
- @skipIfOutOfTreeDebugserver
def test_watchos_armv7k(self):
"""Test running a 32-bit watchOS simulator binary"""
self.run_with(
@@ -150,7 +146,6 @@ def test_watchos_armv7k(self):
@skipUnlessDarwin
@skipIfDarwinEmbedded
- @skipIfOutOfTreeDebugserver
def test_lc_version_min_macosx(self):
"""Test running a back-deploying non-simulator MacOS X binary"""
self.run_with(
@@ -166,7 +161,6 @@ def test_lc_version_min_macosx(self):
@skipIfDarwinEmbedded
@apple_simulator_test("iphone")
@skipIf(archs=["arm64", "arm64e"])
- @skipIfOutOfTreeDebugserver
def test_lc_version_min_iphoneos(self):
"""Test running a back-deploying iOS simulator binary
with a legacy iOS load command"""
@@ -183,7 +177,6 @@ def test_lc_version_min_iphoneos(self):
@skipIfDarwinEmbedded
@apple_simulator_test("iphone")
@skipIf(archs=["arm64", "arm64e"])
- @skipIfOutOfTreeDebugserver
def test_ios_backdeploy_x86(self):
"""Test running a back-deploying iOS simulator binary
with a legacy iOS load command"""
@@ -200,7 +193,6 @@ def test_ios_backdeploy_x86(self):
@skipIfDarwinEmbedded
@apple_simulator_test("iphone")
@skipIf(archs=["i386", "x86_64"])
- @skipIfOutOfTreeDebugserver
def test_ios_backdeploy_apple_silicon(self):
"""Test running a back-deploying iOS simulator binary"""
self.run_with(
@@ -216,7 +208,6 @@ def test_ios_backdeploy_apple_silicon(self):
@skipIfDarwinEmbedded
@apple_simulator_test("appletv")
@skipIf(archs=["arm64", "arm64e"])
- @skipIfOutOfTreeDebugserver
def test_lc_version_min_tvos(self):
"""Test running a back-deploying tvOS simulator binary
with a legacy tvOS load command"""
@@ -233,7 +224,6 @@ def test_lc_version_min_tvos(self):
@skipIfDarwinEmbedded
@apple_simulator_test("appletv")
@skipIf(archs=["i386", "x86_64"])
- @skipIfOutOfTreeDebugserver
def test_tvos_backdeploy_apple_silicon(self):
"""Test running a back-deploying tvOS simulator binary"""
self.run_with(
@@ -250,7 +240,6 @@ def test_tvos_backdeploy_apple_silicon(self):
@apple_simulator_test("watch")
@skipIf(archs=["arm64", "arm64e"])
@skipIfDarwin # rdar://problem/64552748
- @skipIfOutOfTreeDebugserver
def test_lc_version_min_watchos(self):
"""Test running a back-deploying watchOS simulator binary
with a legacy watchOS load command"""
@@ -268,7 +257,6 @@ def test_lc_version_min_watchos(self):
@apple_simulator_test("watch")
@skipIf(archs=["arm64", "arm64e"])
@skipIfDarwin # rdar://problem/64552748
- @skipIfOutOfTreeDebugserver
def test_watchos_backdeploy_apple_silicon(self):
"""Test running a back-deploying watchOS simulator binary"""
self.run_with(
diff --git a/lldb/test/API/macosx/skinny-corefile/TestSkinnyCorefile.py b/lldb/test/API/macosx/skinny-corefile/TestSkinnyCorefile.py
index 138792d817dbf3e..02ab856aabc6b36 100644
--- a/lldb/test/API/macosx/skinny-corefile/TestSkinnyCorefile.py
+++ b/lldb/test/API/macosx/skinny-corefile/TestSkinnyCorefile.py
@@ -12,7 +12,6 @@
class TestSkinnyCorefile(TestBase):
- @skipIfOutOfTreeDebugserver # newer debugserver required for these qMemoryRegionInfo types
@skipIf(
debug_info=no_match(["dsym"]),
bugnumber="This test is looking explicitly for a dSYM",
diff --git a/lldb/test/API/macosx/stack-corefile/TestStackCorefile.py b/lldb/test/API/macosx/stack-corefile/TestStackCorefile.py
index 60e9d44141480db..b96bfe87ad48f3a 100644
--- a/lldb/test/API/macosx/stack-corefile/TestStackCorefile.py
+++ b/lldb/test/API/macosx/stack-corefile/TestStackCorefile.py
@@ -11,7 +11,6 @@
class TestStackCorefile(TestBase):
- @skipIfOutOfTreeDebugserver # newer debugserver required for these qMemoryRegionInfo types
@no_debug_info_test
@skipUnlessDarwin
@skipIfRemote
diff --git a/lldb/test/API/macosx/unregistered-macho/TestUnregisteredMacho.py b/lldb/test/API/macosx/unregistered-macho/TestUnregisteredMacho.py
index 54c0f1916401563..d887d55f1161298 100644
--- a/lldb/test/API/macosx/unregistered-macho/TestUnregisteredMacho.py
+++ b/lldb/test/API/macosx/unregistered-macho/TestUnregisteredMacho.py
@@ -13,7 +13,6 @@
class TestUnregisteredMacho(TestBase):
# newer debugserver required for jGetLoadedDynamicLibrariesInfos
# to support this
- @skipIfOutOfTreeDebugserver
@no_debug_info_test
@skipUnlessDarwin
def test(self):
diff --git a/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py b/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
index ad503e19de7970c..5bae98d326762f7 100644
--- a/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
+++ b/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
@@ -25,7 +25,6 @@ def _extract_register_value(reg_info, reg_bank, byte_order, bytes_per_entry=8):
class TestGdbRemoteGPacket(gdbremote_testcase.GdbRemoteTestCaseBase):
- @skipIfOutOfTreeDebugserver
@skipUnlessDarwin # G packet not supported
def test_g_packet(self):
self.build()
|
jimingham
approved these changes
Feb 6, 2025
There was a problem hiding this comment.
I agree, this is a good cleanup and if these tests are still failing for realz because of the debugservers we have on the bots where we can't sign debugserver, we should update those. And if the tests are failing for other reasons that would be good to find out.
|
The Xcode installed on the macOS CI bots was updated to Xcode 16.2 a few weeks ago, so we've got a pretty recent debugserver being used on them now. |
Icohedron
pushed a commit
to Icohedron/llvm-project
that referenced
this pull request
Feb 11, 2025
When a test depends on a new debugserver feature/fix, the API test must be marked @skipIfOutOfTreeDebugserver because the macOS CI bots test using the latest Xcode release debugserver. But over time all of these fixes & new features are picked up in the Xcode debugserver and these skips can be removed. We may see unexpected test failures from removing all of these 1+ year old skips, but that's likely a separate reason the test is failing that is being papered over by this skip.
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.
When a test depends on a new debugserver feature/fix, the API test must be marked @skipIfOutOfTreeDebugserver because the macOS CI bots test using the latest Xcode release debugserver. But over time all of these fixes & new features are picked up in the Xcode debugserver and these skips can be removed.
We may see unexpected test failures from removing all of these 1+ year old skips, but that's likely a separate reason the test is failing that is being papered over by this skip.