[lldb][NFC] update API tests which skip/expect-fail arm

The architectures provided to skipIf / expectedFail are regular
expressions (v. _match_decorator_property() in decorators.py
so on Darwin systems "arm64" would match the skips for "arm" (32-bit
Linux).  Update these to "arm$" to prevent this, and also update
three tests (TestBuiltinFormats.py, TestCrossDSOTailCalls.py,
TestCrossObjectTailCalls.py) that were skipped for arm64 via this
behavior, and need to be skipped or they will fail.

This was moviated by the new TestDynamicValue.py test which has
an expected-fail for arm, but the test was passing on arm64 Darwin
resulting in failure for the CIs.

Author: jasonmolenda

lldb/test/API/api/multiple-targets/TestMultipleTargets.py

@@ -11,7 +11,7 @@
 class TestMultipleTargets(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     @skipIfNoSBHeaders
     @expectedFailureAll(
         oslist=["windows"], archs=["i[3-6]86", "x86_64"], bugnumber="llvm.org/pr20282"

lldb/test/API/arm/breakpoint-it/TestBreakpointIt.py

@@ -13,7 +13,7 @@
 class TestBreakpointIt(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipIf(archs=no_match(["arm"]))
+    @skipIf(archs=no_match(["arm$"]))
     @skipIf(archs=["arm64", "arm64e", "arm64_32"])
     def test_false(self):
         self.build()
@@ -29,7 +29,7 @@ def test_false(self):
             self.process().GetState(), lldb.eStateExited, "Breakpoint does not get hit"
         )
 
-    @skipIf(archs=no_match(["arm"]))
+    @skipIf(archs=no_match(["arm$"]))
     @skipIf(archs=["arm64", "arm64e", "arm64_32"])
     def test_true(self):
         self.build()

lldb/test/API/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py

@@ -11,7 +11,7 @@
 
 
 class TestBreakpointThumbCodesection(TestBase):
-    @skipIf(archs=no_match(["arm"]))
+    @skipIf(archs=no_match(["arm$"]))
     @skipIf(archs=["arm64"])
     @skipIfDarwinEmbedded  # codegen on darwin always defaults to thumb for armv7/armv7k targets
     def test_breakpoint(self):

lldb/test/API/commands/expression/multiline-completion/TestMultilineCompletion.py

@@ -29,7 +29,7 @@ def exit_expression_editor(self):
     @skipIfAsan
     @skipIfEditlineSupportMissing
     @expectedFailureAll(oslist=["freebsd"], bugnumber="llvm.org/pr49408")
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     def test_basic_completion(self):
         """Test that we can complete a simple multiline expression"""
         self.build()

lldb/test/API/commands/expression/multiline-navigation/TestMultilineNavigation.py

@@ -17,7 +17,7 @@ class TestCase(PExpectTest):
     @skipIfAsan
     @skipIfEditlineSupportMissing
     @expectedFailureAll(oslist=["freebsd"], bugnumber="llvm.org/pr48316")
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])  # Randomly fails on buildbot
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])  # Randomly fails on buildbot
     def test_nav_arrow_up(self):
         """Tests that we can navigate back to the previous line with the up arrow"""
         self.launch()
@@ -41,7 +41,7 @@ def test_nav_arrow_up(self):
     @skipIfAsan
     @skipIfEditlineSupportMissing
     @expectedFailureAll(oslist=["freebsd"], bugnumber="llvm.org/pr48316")
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])  # Randomly fails on buildbot
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])  # Randomly fails on buildbot
     def test_nav_arrow_down(self):
         """Tests that we can navigate to the next line with the down arrow"""
         self.launch()
@@ -72,7 +72,7 @@ def test_nav_arrow_down(self):
 
     @skipIfAsan
     @skipIfEditlineSupportMissing
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])  # Randomly fails on buildbot
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])  # Randomly fails on buildbot
     def test_nav_arrow_up_empty(self):
         """
         Tests that navigating with the up arrow doesn't crash and skips

lldb/test/API/commands/expression/rdar44436068/Test128BitsInteger.py

@@ -2,5 +2,5 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(
-    __file__, globals(), decorators.skipIf(archs=["arm", "armv7k", "i386"])
+    __file__, globals(), decorators.skipIf(archs=["arm$", "armv7k", "i386"])
 )

lldb/test/API/commands/gui/basic/TestGuiBasic.py

@@ -13,7 +13,7 @@ class BasicGuiCommandTest(PExpectTest):
     # under ASAN on a loaded machine..
     @skipIfAsan
     @skipIfCursesSupportMissing
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     def test_gui(self):
         self.build()
 

lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py

@@ -13,7 +13,7 @@ class TestGuiBasicDebugCommandTest(PExpectTest):
     # under ASAN on a loaded machine..
     @skipIfAsan
     @skipIfCursesSupportMissing
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     def test_gui(self):
         self.build()
 

lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py

@@ -15,7 +15,7 @@ class TestGuiExpandThreadsTree(PExpectTest):
     # under ASAN on a loaded machine..
     @skipIfAsan
     @skipIfCursesSupportMissing
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     @skipIf(bugnumber="rdar://97460266")
     def test_gui(self):
         self.build()

lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py

@@ -15,7 +15,7 @@ class GuiViewLargeCommandTest(PExpectTest):
     @skipIfCursesSupportMissing
     @skipIfRemote  # "run" command will not work correctly for remote debug
     @expectedFailureNetBSD
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     def test_gui(self):
         self.build()
 

lldb/test/API/commands/register/register/register_command/TestRegisters.py

@@ -40,7 +40,7 @@ def get_sme_available(self):
         return None
 
     @skipIfiOSSimulator
-    @skipIf(archs=no_match(["amd64", "arm", "i386", "x86_64"]))
+    @skipIf(archs=no_match(["amd64", "arm$", "i386", "x86_64"]))
     @expectedFailureAll(oslist=["freebsd", "netbsd"], bugnumber="llvm.org/pr48371")
     def test_register_commands(self):
         """Test commands related to registers, in particular vector registers."""
@@ -100,7 +100,7 @@ def test_register_commands(self):
     # Writing of mxcsr register fails, presumably due to a kernel/hardware
     # problem
     @skipIfTargetAndroid(archs=["i386"])
-    @skipIf(archs=no_match(["amd64", "arm", "i386", "x86_64"]))
+    @skipIf(archs=no_match(["amd64", "arm$", "i386", "x86_64"]))
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr37995")
     def test_fp_register_write(self):
         """Test commands that write to registers, in particular floating-point registers."""
@@ -118,7 +118,7 @@ def test_fp_special_purpose_register_read(self):
         self.fp_special_purpose_register_read()
 
     @skipIfiOSSimulator
-    @skipIf(archs=no_match(["amd64", "arm", "i386", "x86_64"]))
+    @skipIf(archs=no_match(["amd64", "arm$", "i386", "x86_64"]))
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr37683")
     def test_register_expressions(self):
         """Test expression evaluation with commands related to registers."""
@@ -556,7 +556,7 @@ def convenience_registers_with_process_attach(self, test_16bit_regs):
             self.expect("expr -- $ax == (($ah << 8) | $al)", substrs=["true"])
 
     @skipIfiOSSimulator
-    @skipIf(archs=no_match(["amd64", "arm", "i386", "x86_64"]))
+    @skipIf(archs=no_match(["amd64", "arm$", "i386", "x86_64"]))
     def test_invalid_invocation(self):
         self.build()
         self.common_setup()
@@ -589,7 +589,7 @@ def test_invalid_invocation(self):
         )
 
     @skipIfiOSSimulator
-    @skipIf(archs=no_match(["amd64", "arm", "i386", "x86_64"]))
+    @skipIf(archs=no_match(["amd64", "arm$", "i386", "x86_64"]))
     def test_write_unknown_register(self):
         self.build()
         self.common_setup()

lldb/test/API/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py

@@ -26,7 +26,7 @@ def setUp(self):
         self.d = {"C_SOURCES": self.source, "EXE": self.exe_name}
 
     # This is a arm and aarch64 specific test case. No other architectures tested.
-    @skipIf(archs=no_match(["arm", "aarch64"]))
+    @skipIf(archs=no_match(["arm$", "aarch64"]))
     def test_multiple_watchpoints_on_same_word(self):
         self.build(dictionary=self.d)
         self.setTearDownCleanup(dictionary=self.d)

lldb/test/API/commands/watchpoints/multiple_hits/TestMultipleHits.py

@@ -15,7 +15,7 @@ class MultipleHitsTestCase(TestBase):
     @skipIf(
         bugnumber="llvm.org/pr30758",
         oslist=["linux"],
-        archs=["arm", "aarch64", "powerpc64le"],
+        archs=["arm$", "aarch64", "powerpc64le"],
     )
     @skipIfwatchOS
     def test(self):

lldb/test/API/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py

@@ -21,7 +21,7 @@ def get_to_start(self, bkpt_text):
     @add_test_categories(["basic_process"])
     @expectedFailureAll(
         macos_version=["<", "14.4"],
-        archs=["aarch64", "arm"],
+        archs=["aarch64", "arm$"],
         bugnumber="<rdar://problem/106868647>",
     )
     def test_step_over_read_watchpoint(self):
@@ -64,7 +64,7 @@ def test_step_over_read_watchpoint(self):
     @add_test_categories(["basic_process"])
     @expectedFailureAll(
         macos_version=["<", "14.4"],
-        archs=["aarch64", "arm"],
+        archs=["aarch64", "arm$"],
         bugnumber="<rdar://problem/106868647>",
     )
     def test_step_over_write_watchpoint(self):

lldb/test/API/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py

@@ -27,7 +27,7 @@ def setUp(self):
         self.d = {"C_SOURCES": self.source, "EXE": self.exe_name}
 
     # Test hangs due to a kernel bug, see fdfeff0f in the linux kernel for details
-    @skipIfTargetAndroid(api_levels=list(range(25 + 1)), archs=["aarch64", "arm"])
+    @skipIfTargetAndroid(api_levels=list(range(25 + 1)), archs=["aarch64", "arm$"])
     @skip
     def test_watched_var_should_only_hit_when_in_scope(self):
         """Test that a variable watchpoint should only hit when in scope."""

lldb/test/API/commands/watchpoints/watchpoint_count/TestWatchpointCount.py

@@ -9,7 +9,7 @@ class TestWatchpointCount(TestBase):
 
     @skipIf(
         oslist=["freebsd", "linux"],
-        archs=["arm", "aarch64"],
+        archs=["arm$", "aarch64"],
         bugnumber="llvm.org/pr26031",
     )
     def test_watchpoint_count(self):

lldb/test/API/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py

@@ -33,7 +33,7 @@ def setUp(self):
         # Build dictionary to have unique executable names for each test
         # method.
 
-    @skipIf(oslist=["linux"], archs=["aarch64", "arm"], bugnumber="llvm.org/pr26031")
+    @skipIf(oslist=["linux"], archs=["aarch64", "arm$"], bugnumber="llvm.org/pr26031")
     @skipIfWindows  # This test is flaky on Windows
     def test_watchlocation_using_watchpoint_set(self):
         """Test watching a location with 'watchpoint set expression -w write -s size' option."""

lldb/test/API/driver/batch_mode/TestBatchMode.py

@@ -14,7 +14,7 @@ class DriverBatchModeTest(PExpectTest):
     source = "main.c"
 
     @skipIf(macos_version=["<", "14.0"], asan=True)
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])  # Randomly fails on buildbot
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])  # Randomly fails on buildbot
     @expectedFlakeyFreeBSD("llvm.org/pr25172 fails rarely on the buildbot")
     def test_batch_mode_run_crash(self):
         """Test that the lldb driver's batch mode works correctly."""
@@ -52,7 +52,7 @@ def test_batch_mode_run_crash(self):
         self.expect("frame variable touch_me_not", substrs=["(char *) touch_me_not"])
 
     @skipIf(macos_version=["<", "14.0"], asan=True)
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])  # Randomly fails on buildbot
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])  # Randomly fails on buildbot
     @expectedFlakeyFreeBSD("llvm.org/pr25172 fails rarely on the buildbot")
     def test_batch_mode_run_exit(self):
         """Test that the lldb driver's batch mode works correctly."""
@@ -89,7 +89,7 @@ def test_batch_mode_run_exit(self):
         child.expect(pexpect.EOF)
 
     @skipIf(macos_version=["<", "14.0"], asan=True)
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])  # Randomly fails on buildbot
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])  # Randomly fails on buildbot
     @expectedFlakeyFreeBSD("llvm.org/pr25172 fails rarely on the buildbot")
     def test_batch_mode_launch_stop_at_entry(self):
         """Test that the lldb driver's batch mode works correctly for process launch."""
@@ -129,7 +129,7 @@ def closeVictim(self):
             self.victim = None
 
     @skipIf(macos_version=["<", "14.0"], asan=True)
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])  # Randomly fails on buildbot
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])  # Randomly fails on buildbot
     @expectedFlakeyFreeBSD("llvm.org/pr25172 fails rarely on the buildbot")
     @expectedFailureNetBSD
     def test_batch_mode_attach_exit(self):

lldb/test/API/driver/job_control/TestJobControl.py

@@ -9,7 +9,7 @@
 
 class JobControlTest(PExpectTest):
     @skipIf(macos_version=["<", "14.0"], asan=True)
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     def test_job_control(self):
         def post_spawn():
             self.child.expect("PID=([0-9]+)")

lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/TestBreakpointCallbackCommandSource.py

@@ -19,7 +19,7 @@ class BreakpointCallbackCommandSource(PExpectTest):
     # under ASAN on a loaded machine..
     @skipIfAsan
     @skipIfEditlineSupportMissing
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     @skipIf(oslist=["freebsd"], bugnumber="llvm.org/pr48316")
     def test_breakpoint_callback_command_source(self):
         self.build()

lldb/test/API/functionalities/breakpoint/hardware_breakpoints/require_hw_breakpoints/TestRequireHWBreakpoints.py

@@ -90,7 +90,7 @@ def test_step_over(self):
         )
 
     # Was reported to sometimes pass on certain hardware.
-    @skipIf(oslist=["linux"], archs=["arm"])
+    @skipIf(oslist=["linux"], archs=["arm$"])
     @skipTestIfFn(HardwareBreakpointTestBase.supports_hw_breakpoints)
     def test_step_until(self):
         """Test stepping until when hardware breakpoints are required."""

lldb/test/API/functionalities/breakpoint/two_hits_one_actual/TestTwoHitsOneActual.py

@@ -14,7 +14,7 @@
 class TestTwoHitsOneActual(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     def test_two_hits_one_actual(self):
         """There can be many tests in a test case - describe this test here."""
         self.build()

lldb/test/API/functionalities/bt-interrupt/TestInterruptBacktrace.py

@@ -12,7 +12,7 @@
 class TestInterruptingBacktrace(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipIf(oslist=["linux"], archs=["arm"])
+    @skipIf(oslist=["linux"], archs=["arm$"])
     def test_backtrace_interrupt(self):
         """Use RequestInterrupt followed by stack operations
         to ensure correct interrupt behavior for stacks."""

lldb/test/API/functionalities/data-formatter/builtin-formats/TestBuiltinFormats.py

@@ -37,7 +37,7 @@ def testAllPlatforms(self):
     @no_debug_info_test
     @skipIfWindows
     # uint128_t not available on arm.
-    @skipIf(archs=["arm"])
+    @skipIf(archs=["arm$"])
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
@@ -118,10 +118,12 @@ def test(self):
         self.assertIn("= 0x1p1\n", self.getFormatted("hex float", "2.0f"))
         self.assertIn("= 0x1p1\n", self.getFormatted("hex float", "2.0"))
         # FIXME: long double not supported.
-        self.assertIn(
-            "= error: unsupported byte size (16) for hex float format\n",
-            self.getFormatted("hex float", "2.0l"),
-        )
+        # on Darwin arm64, long double is 8 bytes, same as long.
+        if self.getArchitecture() != "arm64":
+            self.assertIn(
+                "= error: unsupported byte size (16) for hex float format\n",
+                self.getFormatted("hex float", "2.0l"),
+            )
 
         # uppercase hex
         self.assertIn("= 0x00ABC123\n", self.getFormatted("uppercase hex", "0xABC123"))

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py

@@ -12,7 +12,7 @@
 class StdUniquePtrDataFormatterTestCase(TestBase):
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     def test_with_run_command(self):
         self.build()
         self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
@@ -89,7 +89,7 @@ def test_with_run_command(self):
     @skipIfWindows  # libstdcpp not ported to Windows
     @skipIfDarwin  # doesn't compile on Darwin
     @skipIfwatchOS  # libstdcpp not ported to watchos
-    @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
+    @skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
     @add_test_categories(["libstdcxx"])
     def test_recursive_unique_ptr(self):
         # Tests that LLDB can handle when we have a loop in the unique_ptr

lldb/test/API/functionalities/dyld-launch-linux/TestDyldLaunchLinux.py

@@ -13,7 +13,7 @@
 class TestLinux64LaunchingViaDynamicLoader(TestBase):
     @skipIf(oslist=no_match(["linux"]))
     @no_debug_info_test
-    @skipIf(oslist=["linux"], archs=["arm"])
+    @skipIf(oslist=["linux"], archs=["arm$"])
     def test(self):
         self.build()
 

lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py

@@ -12,7 +12,7 @@ class AssertingInferiorTestCase(TestBase):
         oslist=["windows"],
         bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows",
     )
-    @expectedFailureAll(oslist=["linux"], archs=["arm"], bugnumber="llvm.org/pr25338")
+    @expectedFailureAll(oslist=["linux"], archs=["arm$"], bugnumber="llvm.org/pr25338")
     @expectedFailureAll(bugnumber="llvm.org/pr26592", triple="^mips")
     def test_inferior_asserting(self):
         """Test that lldb reliably catches the inferior asserting (command)."""
@@ -35,7 +35,7 @@ def test_inferior_asserting_register(self):
     )
     @expectedFailureAll(
         oslist=["linux"],
-        archs=["arm"],
+        archs=["arm$"],
         triple=no_match(".*-android"),
         bugnumber="llvm.org/pr25338",
     )
@@ -61,7 +61,7 @@ def test_inferior_asserting_python(self):
     )
     @expectedFailureAll(
         oslist=["linux"],
-        archs=["arm"],
+        archs=["arm$"],
         triple=no_match(".*-android"),
         bugnumber="llvm.org/pr25338",
     )
@@ -77,7 +77,7 @@ def test_inferior_asserting_expr(self):
     )
     @expectedFailureAll(
         oslist=["linux"],
-        archs=["arm"],
+        archs=["arm$"],
         triple=no_match(".*-android"),
         bugnumber="llvm.org/pr25338",
     )