Skip to content

Commit 1c24c8b

Browse files
committed
DNM: check what the frontend is doing for some tests
1 parent 9753d23 commit 1c24c8b

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
@@ -29,14 +29,14 @@
2929
// we should fall back to the SDK.
3030

3131
// RUN: %empty-directory(%t/mcp)
32-
// RUN: %target-swift-frontend(mock-sdk: -sdk %t/good-sdk) -resource-dir %t/empty-toolchain/usr/lib/swift -module-cache-path %t/mcp -typecheck -verify -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import %s
32+
// RUN: %target-swift-frontend(mock-sdk: -sdk %t/good-sdk) -Xcc -v -resource-dir %t/empty-toolchain/usr/lib/swift -module-cache-path %t/mcp -typecheck -verify -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import %s
3333

3434
// If the compiler's resource directory *does* contain a runtime swiftmodule, we
3535
// should *not* use the one in the SDK. (We assume that the resource directory
3636
// built with this compiler does contain a standard library.)
3737

3838
// RUN: %empty-directory(%t/mcp)
39-
// RUN: %target-swift-frontend(mock-sdk: -sdk %t/bad-sdk) -module-cache-path %t/mcp -typecheck -verify -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import %s
39+
// RUN: %target-swift-frontend(mock-sdk: -sdk %t/bad-sdk) -Xcc -v -module-cache-path %t/mcp -typecheck -verify -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import %s
4040

4141
// If neither the resource directory nor the SDK contains a runtime swiftmodule,
4242
// loading should fail. This just proves that we aren't getting runtime imports
@@ -48,18 +48,17 @@
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)
54-
// 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
53+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-sdk) -Xcc -v -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
5554
// CHECK-EMPTY-NOT: '-isystem' '{{.*}}/bad-sdk/usr/lib/swift/shims'
5655
// CHECK-EMPTY: error: could not find module 'Swift' for target '{{.*}}'; found: garbage-garbage-garbage, at: {{.*}}/Swift.swiftmodule
5756

5857
// Check that, when the toolchain *doesn't* have SwiftShims in it, ClagImporter
5958
// *does* add a -I flag to look in the SDK.
6059

6160
// RUN: %empty-directory(%t/mcp)
62-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-sdk) -resource-dir %t/really-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-REALLY-EMPTY %s
61+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-sdk) -Xcc -v -resource-dir %t/really-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-REALLY-EMPTY %s
6362
// CHECK-REALLY-EMPTY: '-isystem' '{{.*}}/bad-sdk/usr/lib/swift/shims'
6463
// CHECK-REALLY-EMPTY: error: could not find module 'Swift' for target '{{.*}}'; found: garbage-garbage-garbage, at: {{.*}}/Swift.swiftmodule
6564

0 commit comments

Comments
 (0)