Skip to content

Commit 06b06ba

Browse files
authored
Merge pull request #3298 from apple/unblock-linux
[lldb] Skip failing tests on Linux
2 parents 851df3b + 742fc62 commit 06b06ba

File tree

4 files changed

+26
-13
lines changed

4 files changed

+26
-13
lines changed
Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import lldbsuite.test.lldbinline as lldbinline
22
from lldbsuite.test.decorators import *
33

4-
lldbinline.MakeInlineTest(__file__, globals(), decorators=[
5-
skipIf(bugnumber="rdar://60396797", # should work but crashes.
6-
setting=('symbols.use-swift-clangimporter', 'false')),
7-
swiftTest])
4+
lldbinline.MakeInlineTest(
5+
__file__,
6+
globals(),
7+
decorators=[
8+
skipIf(
9+
bugnumber="rdar://60396797", # should work but crashes.
10+
setting=('symbols.use-swift-clangimporter', 'false')),
11+
expectedFailureAll(oslist=["linux"], bugnumber="rdar://83444822"),
12+
swiftTest
13+
])

lldb/test/API/lang/swift/expression/exclusivity_suppression/TestExclusivitySuppression.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class TestExclusivitySuppression(TestBase):
3636
# Test that we can evaluate w.s.i at Breakpoint 1 without triggering
3737
# a failure due to exclusivity
3838
@swiftTest
39+
@expectedFailureAll(oslist=["linux"], bugnumber="rdar://83444943")
3940
def test_basic_exclusivity_suppression(self):
4041
"""Test that exclusively owned values can still be accessed"""
4142

@@ -56,6 +57,7 @@ def test_basic_exclusivity_suppression(self):
5657
# (5) Evaluating w.s.i again to check that finishing the nested expression
5758
# did not prematurely re-enable exclusivity checks.
5859
@swiftTest
60+
@expectedFailureAll(oslist=["linux"], bugnumber="rdar://83444943")
5961
def test_exclusivity_suppression_for_concurrent_expressions(self):
6062
"""Test that exclusivity suppression works with concurrent expressions"""
6163
self.build()
@@ -98,5 +100,3 @@ def check_expression(self, frame, expression, expected_result, use_summary=True)
98100
report_str = "%s expected: %s got: %s" % (
99101
expression, expected_result, answer)
100102
self.assertTrue(answer == expected_result, report_str)
101-
102-

lldb/test/API/lang/swift/implementation_only_imports/main_executable/TestMainExecutable.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,14 @@ def cleanup():
6565
self.expect("e value", substrs=["(SomeLibrary.TwoInts)", "= (first = 2, second = 3)"])
6666
self.expect("e container", substrs=["(main.ContainsTwoInts)", "wrapped = (first = 2, second = 3)", "other = 10"])
6767
self.expect("e TwoInts(4, 5)", substrs=["(SomeLibrary.TwoInts)", "= (first = 4, second = 5)"])
68-
68+
6969
@skipIf(bugnumber="rdar://problem/54322424", # This test is unreliable.
7070
setting=('symbols.use-swift-clangimporter', 'false'))
7171
@swiftTest
72+
@skipIfLinux # rdar://problem/67348391
7273
def test_implementation_only_import_main_executable_no_library_module(self):
7374
"""Test `@_implementationOnly import` in the main executable, after removing the library's swiftmodule
74-
75+
7576
See the ReadMe.md in the parent directory for more information.
7677
"""
7778

@@ -105,7 +106,7 @@ def cleanup():
105106
@expectedFailureAll(oslist=["windows"])
106107
def test_implementation_only_import_main_executable_resilient(self):
107108
"""Test `@_implementationOnly import` in the main executable with a resilient library
108-
109+
109110
See the ReadMe.md in the parent directory for more information.
110111
"""
111112

@@ -124,12 +125,12 @@ def cleanup():
124125
self.expect("e value", substrs=["(SomeLibrary.TwoInts)", "= (first = 2, second = 3)"])
125126
self.expect("e container", substrs=["(main.ContainsTwoInts)", "wrapped = (first = 2, second = 3)", "other = 10"])
126127
self.expect("e TwoInts(4, 5)", substrs=["(SomeLibrary.TwoInts)", "= (first = 4, second = 5)"])
127-
128+
128129
@swiftTest
129130
@expectedFailureOS(no_match(["macosx"])) # Requires Remote Mirrors support
130131
def test_implementation_only_import_main_executable_resilient_no_library_module(self):
131132
"""Test `@_implementationOnly import` in the main executable with a resilient library, after removing the library's swiftmodule
132-
133+
133134
See the ReadMe.md in the parent directory for more information.
134135
"""
135136

lldb/test/API/lang/swift/po/sys_types/TestSwiftPOSysTypes.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@
1212
import lldbsuite.test.lldbinline as lldbinline
1313
from lldbsuite.test.decorators import *
1414

15-
lldbinline.MakeInlineTest(__file__, globals(),
16-
decorators=[swiftTest,skipIf(oslist=['windows'])])
15+
lldbinline.MakeInlineTest(__file__,
16+
globals(),
17+
decorators=[
18+
swiftTest,
19+
skipIf(oslist=['windows']),
20+
expectedFailureAll(oslist=["linux"],
21+
bugnumber="rdar://83444822")
22+
])

0 commit comments

Comments
 (0)