Skip to content

Commit 6d6feaf

Browse files
committed
[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.
1 parent e2f118d commit 6d6feaf

File tree

64 files changed

+105
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+105
-103
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class TestMultipleTargets(TestBase):
1212
NO_DEBUG_INFO_TESTCASE = True
1313

14-
@skipIf(oslist=["linux"], archs=["arm", "aarch64"])
14+
@skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
1515
@skipIfNoSBHeaders
1616
@expectedFailureAll(
1717
oslist=["windows"], archs=["i[3-6]86", "x86_64"], bugnumber="llvm.org/pr20282"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
class TestBreakpointIt(TestBase):
1414
NO_DEBUG_INFO_TESTCASE = True
1515

16-
@skipIf(archs=no_match(["arm"]))
16+
@skipIf(archs=no_match(["arm$"]))
1717
@skipIf(archs=["arm64", "arm64e", "arm64_32"])
1818
def test_false(self):
1919
self.build()
@@ -29,7 +29,7 @@ def test_false(self):
2929
self.process().GetState(), lldb.eStateExited, "Breakpoint does not get hit"
3030
)
3131

32-
@skipIf(archs=no_match(["arm"]))
32+
@skipIf(archs=no_match(["arm$"]))
3333
@skipIf(archs=["arm64", "arm64e", "arm64_32"])
3434
def test_true(self):
3535
self.build()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def exit_expression_editor(self):
2929
@skipIfAsan
3030
@skipIfEditlineSupportMissing
3131
@expectedFailureAll(oslist=["freebsd"], bugnumber="llvm.org/pr49408")
32-
@skipIf(oslist=["linux"], archs=["arm", "aarch64"])
32+
@skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
3333
def test_basic_completion(self):
3434
"""Test that we can complete a simple multiline expression"""
3535
self.build()

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class TestCase(PExpectTest):
1717
@skipIfAsan
1818
@skipIfEditlineSupportMissing
1919
@expectedFailureAll(oslist=["freebsd"], bugnumber="llvm.org/pr48316")
20-
@skipIf(oslist=["linux"], archs=["arm", "aarch64"]) # Randomly fails on buildbot
20+
@skipIf(oslist=["linux"], archs=["arm$", "aarch64"]) # Randomly fails on buildbot
2121
def test_nav_arrow_up(self):
2222
"""Tests that we can navigate back to the previous line with the up arrow"""
2323
self.launch()
@@ -41,7 +41,7 @@ def test_nav_arrow_up(self):
4141
@skipIfAsan
4242
@skipIfEditlineSupportMissing
4343
@expectedFailureAll(oslist=["freebsd"], bugnumber="llvm.org/pr48316")
44-
@skipIf(oslist=["linux"], archs=["arm", "aarch64"]) # Randomly fails on buildbot
44+
@skipIf(oslist=["linux"], archs=["arm$", "aarch64"]) # Randomly fails on buildbot
4545
def test_nav_arrow_down(self):
4646
"""Tests that we can navigate to the next line with the down arrow"""
4747
self.launch()
@@ -72,7 +72,7 @@ def test_nav_arrow_down(self):
7272

7373
@skipIfAsan
7474
@skipIfEditlineSupportMissing
75-
@skipIf(oslist=["linux"], archs=["arm", "aarch64"]) # Randomly fails on buildbot
75+
@skipIf(oslist=["linux"], archs=["arm$", "aarch64"]) # Randomly fails on buildbot
7676
def test_nav_arrow_up_empty(self):
7777
"""
7878
Tests that navigating with the up arrow doesn't crash and skips

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
from lldbsuite.test import decorators
33

44
lldbinline.MakeInlineTest(
5-
__file__, globals(), decorators.skipIf(archs=["arm", "armv7k", "i386"])
5+
__file__, globals(), decorators.skipIf(archs=["arm$", "armv7k", "i386"])
66
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class BasicGuiCommandTest(PExpectTest):
1313
# under ASAN on a loaded machine..
1414
@skipIfAsan
1515
@skipIfCursesSupportMissing
16-
@skipIf(oslist=["linux"], archs=["arm", "aarch64"])
16+
@skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
1717
def test_gui(self):
1818
self.build()
1919

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class TestGuiBasicDebugCommandTest(PExpectTest):
1313
# under ASAN on a loaded machine..
1414
@skipIfAsan
1515
@skipIfCursesSupportMissing
16-
@skipIf(oslist=["linux"], archs=["arm", "aarch64"])
16+
@skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
1717
def test_gui(self):
1818
self.build()
1919

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class TestGuiExpandThreadsTree(PExpectTest):
1515
# under ASAN on a loaded machine..
1616
@skipIfAsan
1717
@skipIfCursesSupportMissing
18-
@skipIf(oslist=["linux"], archs=["arm", "aarch64"])
18+
@skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
1919
@skipIf(bugnumber="rdar://97460266")
2020
def test_gui(self):
2121
self.build()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class GuiViewLargeCommandTest(PExpectTest):
1515
@skipIfCursesSupportMissing
1616
@skipIfRemote # "run" command will not work correctly for remote debug
1717
@expectedFailureNetBSD
18-
@skipIf(oslist=["linux"], archs=["arm", "aarch64"])
18+
@skipIf(oslist=["linux"], archs=["arm$", "aarch64"])
1919
def test_gui(self):
2020
self.build()
2121

0 commit comments

Comments
 (0)