Skip to content

Commit af135be

Browse files
author
git apple-llvm automerger
committed
Merge commit '2786bb3f51a3' from swift/swift-5.2-branch into swift/master
2 parents dd8dedc + 2786bb3 commit af135be

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

lldb/packages/Python/lldbsuite/test/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py

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

44
lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest, skipUnlessDarwin,
5-
expectedFailureAll(archs=['arm64', 'arm64e', 'arm64_32'], bugnumber="<rdar://problem/58065423>")])
5+
expectedFailureAll(archs=['arm64_32'], bugnumber="<rdar://problem/58065423>")])

lldb/packages/Python/lldbsuite/test/lang/swift/foundation_value_types/url/TestSwiftFoundationTypeURL.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414

1515
lldbinline.MakeInlineTest(__file__, globals(),
1616
decorators=[swiftTest,skipUnlessDarwin,
17-
expectedFailureAll(archs=['arm64', 'arm64e', 'arm64_32'], bugnumber="<rdar://problem/58065423>")])
17+
expectedFailureAll(archs=['arm64_32'], bugnumber="<rdar://problem/58065423>")])

lldb/packages/Python/lldbsuite/test/lang/swift/swift_version/TestSwiftVersion.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ def cleanup():
5858
# Create the target
5959
target = self.dbg.CreateTarget(exe_path)
6060
self.assertTrue(target, VALID_TARGET)
61+
self.registerSharedLibrariesWithTarget(target, ['mod4', 'mod5'])
6162

6263
for t in tests:
6364
source_name = t['file']

0 commit comments

Comments
 (0)