Skip to content

Commit 71f6232

Browse files
committed
[test] Enable Serialization/runtime-import-from-sdk on non-Darwin platforms
Also, remove Swift runtime modules from Serialization/module_defining_interface,_client that are unused.
1 parent 8ce5f2b commit 71f6232

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

test/Serialization/module_defining_interface.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// RUN: %empty-directory(%t/inputs)
33
// RUN: %empty-directory(%t/test-sdk)
44
// RUN: %empty-directory(%t/test-sdk/usr/lib/swift)
5-
// RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/test-sdk/usr/lib/swift/Swift.swiftmodule
65

76
// RUN: %empty-directory(%t/test-sdk/usr/lib/Foo.swiftmodule)
87
// RUN: split-file %s %t

test/Serialization/module_defining_interface_client.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
// RUN: %empty-directory(%t/test-sdk/usr/lib/Bar.swiftmodule)
77
// RUN: %empty-directory(%t/test-sdk/usr/lib/_Foo_Bar.swiftmodule)
88
// RUN: %empty-directory(%t/test-sdk/usr/lib/Foo.swiftcrossimport)
9-
// RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/test-sdk/usr/lib/swift/Swift.swiftmodule
109

1110
// RUN: split-file %s %t
1211

test/Serialization/runtime-import-from-sdk.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
// %t/good-sdk contains a loadable standard library.
88
// RUN: %empty-directory(%t/good-sdk)
9-
// RUN: %empty-directory(%t/good-sdk/usr/lib/swift)
10-
// RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/good-sdk/usr/lib/swift/Swift.swiftmodule
9+
// RUN: %empty-directory(%t/good-sdk/usr/lib/swift/%target-sdk-name)
10+
// RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/good-sdk/usr/lib/swift/%target-sdk-name/Swift.swiftmodule
1111

1212
// %t/bad-sdk contains an invalid standard library that cannot be loaded.
1313
// RUN: %empty-directory(%t/bad-sdk)
14-
// RUN: %empty-directory(%t/bad-sdk/usr/lib/swift/Swift.swiftmodule)
15-
// RUN: touch %t/bad-sdk/usr/lib/swift/Swift.swiftmodule/garbage-garbage-garbage.swiftmodule
14+
// RUN: %empty-directory(%t/bad-sdk/usr/lib/swift/%target-sdk-name/Swift.swiftmodule)
15+
// RUN: touch %t/bad-sdk/usr/lib/swift/%target-sdk-name/Swift.swiftmodule/garbage-garbage-garbage.swiftmodule
1616

1717
// %t/empty-toolchain does not contain a standard library.
1818
// RUN: %empty-directory(%t/empty-toolchain)
@@ -48,7 +48,6 @@
4848
// FIXME: We can't properly test this on a non-Darwin platform because we'll get
4949
// the same error message for "unloadable standard library" and "no standard
5050
// library" (https://github.com/apple/swift/issues/52499).
51-
// REQUIRES: objc_interop
5251

5352
// RUN: %empty-directory(%t/mcp)
5453
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-sdk) -resource-dir %t/empty-toolchain/usr/lib/swift -module-cache-path %t/mcp -typecheck %s -dump-clang-diagnostics -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import 2>&1 | %FileCheck --check-prefix CHECK-EMPTY %s

0 commit comments

Comments
 (0)