Skip to content

Commit 85bef69

Browse files
committed
NFC: Simplify and clean up some existing tests for the versioned variants of #if canImport().
The ClangImporter tests for `#if canImport(..., _underlyingVersion: ...)` do not really depend on a Swift overlay being present for Simple.framework, so remove the overlay related `RUN` steps.
1 parent d3bdc13 commit 85bef69

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

test/ClangImporter/can_import_underlying_version.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
// REQUIRES: VENDOR=apple
22
// RUN: %empty-directory(%t)
3-
// RUN: %empty-directory(%t/overlaydir)
43
// RUN: %empty-directory(%t/frameworks)
54

65
// RUN: cp -rf %S/Inputs/frameworks/Simple.framework %t/frameworks/
76

87
// RUN: echo "current-version: 1830.100" > %t/frameworks/Simple.framework/Simple.tbd
9-
// RUN: echo "@_exported import Simple" > %t.overlay.swift
10-
// RUN: echo "public func additional() {}" >> %t.overlay.swift
118

12-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -disable-implicit-concurrency-module-import -module-name Simple -F %t/frameworks/ %t.overlay.swift -emit-module-path %t/overlaydir/Simple.swiftmodule
13-
// RUN: %target-typecheck-verify-swift -disable-implicit-concurrency-module-import -I %t/overlaydir/ -F %t/frameworks
9+
// RUN: %target-typecheck-verify-swift -disable-implicit-concurrency-module-import -F %t/frameworks
1410

1511
import Simple
1612

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
// REQUIRES: VENDOR=apple
22
// RUN: %empty-directory(%t)
3-
// RUN: %empty-directory(%t/overlaydir)
43
// RUN: %empty-directory(%t/frameworks)
54

65
// RUN: cp -rf %S/Inputs/frameworks/Simple.framework %t/frameworks/
76

87
// RUN: echo "" > %t/frameworks/Simple.framework/Simple.tbd
9-
// RUN: echo "@_exported import Simple" > %t.overlay.swift
10-
// RUN: echo "public func additional() {}" >> %t.overlay.swift
11-
12-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -disable-implicit-concurrency-module-import -module-name Simple -F %t/frameworks/ %t.overlay.swift -emit-module-path %t/overlaydir/Simple.swiftmodule
13-
// RUN: %target-typecheck-verify-swift -disable-implicit-concurrency-module-import -I %t/overlaydir/ -F %t/frameworks
8+
// RUN: %target-typecheck-verify-swift -disable-implicit-concurrency-module-import -F %t/frameworks
149

1510
import Simple
1611

1712
func canImportVersioned() {
1813
#if canImport(Simple, _underlyingVersion: 3.3) // expected-warning {{cannot find user version number for Clang module 'Simple'; version number ignored}}
14+
let a = 1 // expected-warning {{initialization of immutable value 'a' was never used; consider replacing with assignment to '_' or removing it}}
1915
#endif
2016
}

test/Parse/ConditionalCompilation/can_import_version.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %empty-directory(%t/textual)
33
// RUN: %empty-directory(%t/binary)
4-
// RUN: %empty-directory(%t/module-cache)
54

65
// RUN: echo "public func foo() {}" > %t/Foo.swift
76
// RUN: %target-swift-frontend -emit-module %t/Foo.swift -module-name Foo -swift-version 5 -disable-implicit-concurrency-module-import -user-module-version 113.330.1.2.3 -emit-module-interface-path %t/textual/Foo.swiftinterface -enable-library-evolution -emit-module-path %t/binary/Foo.swiftmodule
@@ -86,6 +85,7 @@ func canImportVersioned() {
8685
#endif
8786
}
8887

88+
/// Test versions specified as string literals.
8989
func canImportVersionedString() {
9090
#if canImport(Foo, _version: "0")
9191
let majorZero = 1 // expected-warning {{initialization of immutable value 'majorZero' was never used; consider replacing with assignment to '_' or removing it}}
@@ -143,7 +143,7 @@ func canImportVersionedString() {
143143
let extraComponent = 1 // expected-warning {{initialization of immutable value 'extraComponent' was never used; consider replacing with assignment to '_' or removing it}}
144144
#endif
145145

146-
#if canImport(Foo, _underlyingVersion: 113.33)
146+
#if canImport(Foo, _underlyingVersion: "113.33")
147147
// Foo is a Swift module with no underlying clang module.
148148
let underlyingMinorSmaller = 1
149149
#endif

0 commit comments

Comments
 (0)