Skip to content

Commit cdfeadf

Browse files
finagolfinfinagolfin
committed
Fix tests on linux CI
1 parent 45714f1 commit cdfeadf

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

‎test/Inputs/clang-importer-sdk/usr/lib/swift/apinotes/cfuncs.apinotes renamed to ‎test/ClangImporter/Inputs/cfuncs.apinotes

File renamed without changes.

‎test/ClangImporter/sdk-apinotes.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -verify
1+
// RUN: %empty-directory(%t/sdk/usr/lib/swift/apinotes)
2+
// RUN: %empty-directory(%t/sdk/usr/lib/swift/%target-sdk-name)
3+
// RUN: cp -r %clang-importer-sdk-path/usr/include %t/sdk/usr
4+
// RUN: cp -r %test-resource-dir/shims %t/sdk/usr/lib/swift
5+
// RUN: cp %S/Inputs/cfuncs.apinotes %t/sdk/usr/lib/swift/apinotes
6+
// RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/sdk/usr/lib/swift/%target-sdk-name/
7+
// RUN: %target-swift-frontend(mock-sdk: -sdk %t/sdk) -typecheck %s -verify -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import
28

39
import cfuncs
410

‎test/ModuleInterface/swift_build_sdk_interfaces/check-only-mode.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
// RUN: echo 'public func flat() {}' | %target-swift-frontend - -emit-module-interface-path %t/sdk/usr/lib/swift/Flat.swiftinterface -emit-module -o /dev/null -module-name Flat
77
// RUN: echo 'public func fmwk() {}' | %target-swift-frontend - -emit-module-interface-path %t/sdk/System/Library/Frameworks/FMWK.framework/Modules/FMWK.swiftmodule/%target-swiftinterface-name -emit-module -o /dev/null -module-name FMWK
88

9+
// RUN: cp -r %test-resource-dir/shims %t/sdk/usr/lib/swift
10+
// RUN: ln -s %platform-module-dir %t/sdk/usr/lib/swift
911
// RUN: %swift_build_sdk_interfaces -sdk %t/sdk -Fsystem %t/sdk/System/Library/Frameworks -v -o %t/prebuilt -check-only
1012
// RUN: ls %t/prebuilt | %FileCheck %s
1113
// CHECK-DAG: Normal.swiftmodule

‎test/Serialization/module_defining_interface.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %empty-directory(%t/inputs)
33
// RUN: %empty-directory(%t/test-sdk)
4-
// 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
4+
// RUN: %empty-directory(%t/test-sdk/usr/lib/swift/%target-sdk-name)
5+
// RUN: cp -r %test-resource-dir/shims %t/test-sdk/usr/lib/swift
6+
// RUN: cp -r %platform-module-dir/Swift{,OnoneSupport}.swiftmodule %t/test-sdk/usr/lib/swift/%target-sdk-name/
67

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

‎test/Serialization/module_defining_interface_client.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %empty-directory(%t/inputs)
33
// RUN: %empty-directory(%t/test-sdk)
4-
// RUN: %empty-directory(%t/test-sdk/usr/lib/swift)
4+
// RUN: %empty-directory(%t/test-sdk/usr/lib/swift/%target-sdk-name)
55
// RUN: %empty-directory(%t/test-sdk/usr/lib/Foo.swiftmodule)
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
9+
// RUN: cp -r %test-resource-dir/shims %t/test-sdk/usr/lib/swift
10+
// RUN: cp -r %platform-module-dir/Swift{,OnoneSupport}.swiftmodule %t/test-sdk/usr/lib/swift/%target-sdk-name/
1011

1112
// RUN: split-file %s %t
1213

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@
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)
9+
// RUN: %empty-directory(%t/good-sdk/usr/lib/swift/%target-sdk-name)
1010
// RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/good-sdk/usr/lib/swift/Swift.swiftmodule
11+
// RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/good-sdk/usr/lib/swift/%target-sdk-name/Swift.swiftmodule
1112

1213
// %t/bad-sdk contains an invalid standard library that cannot be loaded.
1314
// RUN: %empty-directory(%t/bad-sdk)
1415
// RUN: %empty-directory(%t/bad-sdk/usr/lib/swift/Swift.swiftmodule)
16+
// RUN: %empty-directory(%t/bad-sdk/usr/lib/swift/%target-sdk-name/Swift.swiftmodule)
1517
// RUN: touch %t/bad-sdk/usr/lib/swift/Swift.swiftmodule/garbage-garbage-garbage.swiftmodule
18+
// RUN: touch %t/bad-sdk/usr/lib/swift/%target-sdk-name/Swift.swiftmodule/garbage-garbage-garbage.swiftmodule
1619

1720
// %t/empty-toolchain does not contain a standard library.
1821
// RUN: %empty-directory(%t/empty-toolchain)
@@ -45,11 +48,6 @@
4548
// We also check that ClangImporter noticed SwiftShims in the toolchain and
4649
// didn't add a -isystem flag to look in the SDK.
4750

48-
// FIXME: We can't properly test this on a non-Darwin platform because we'll get
49-
// the same error message for "unloadable standard library" and "no standard
50-
// library" (https://github.com/apple/swift/issues/52499).
51-
// REQUIRES: objc_interop
52-
5351
// RUN: %empty-directory(%t/mcp)
5452
// 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
5553
// CHECK-EMPTY-NOT: '-isystem' '{{.*}}/bad-sdk/usr/lib/swift/shims'

0 commit comments

Comments
 (0)