Skip to content

Specify -swift-version in tests that emit swiftinterfaces #1985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2025
Merged

Specify -swift-version in tests that emit swiftinterfaces #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Tests/SwiftDriverTests/CachingBuildTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ final class CachingBuildTests: XCTestCase {
let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
let dependencyOracle = InterModuleDependencyOracle()
var driver = try Driver(args: ["swiftc",
"-swift-version", "5",
"-module-name", "ModuleOnly",
"-I", cHeadersPath.nativePathString(escaped: true),
"-I", swiftModuleInterfacesPath.nativePathString(escaped: true),
Expand Down Expand Up @@ -424,6 +425,7 @@ final class CachingBuildTests: XCTestCase {
let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
let dependencyOracle = InterModuleDependencyOracle()
var driver = try Driver(args: ["swiftc",
"-swift-version", "5",
"-module-name", "SeparateModuleJob",
"-I", cHeadersPath.nativePathString(escaped: true),
"-I", swiftModuleInterfacesPath.nativePathString(escaped: true),
Expand Down Expand Up @@ -481,6 +483,7 @@ final class CachingBuildTests: XCTestCase {
let privateSwiftInterfacePath: AbsolutePath = path.appending(component: "testExplicitModuleVerifyInterfaceJobs.private.swiftinterface")
let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
var driver = try Driver(args: ["swiftc",
"-swift-version", "5",
"-I", cHeadersPath.nativePathString(escaped: true),
"-I", swiftModuleInterfacesPath.nativePathString(escaped: true),
"-I", stdlibPath.nativePathString(escaped: true),
Expand Down
3 changes: 3 additions & 0 deletions Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
.appending(component: "Swift")
let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
let invocationArguments = ["swiftc",
"-swift-version", "5",
"-incremental", "-c",
"-emit-module",
"-enable-library-evolution", "-emit-module-interface", "-driver-show-incremental",
Expand Down Expand Up @@ -963,6 +964,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
let privateSwiftInterfacePath: AbsolutePath = path.appending(component: "testExplicitModuleVerifyInterfaceJobs.private.swiftinterface")
let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
var driver = try Driver(args: ["swiftc",
"-swift-version", "5",
"-I", cHeadersPath.nativePathString(escaped: true),
"-I", swiftModuleInterfacesPath.nativePathString(escaped: true),
"-I", stdlibPath.nativePathString(escaped: true),
Expand Down Expand Up @@ -2801,6 +2803,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
"""
)
var driver = try Driver(args: ["swiftc",
"-swift-version", "5",
"-experimental-emit-variant-module",
"-target", "x86_64-apple-macosx10.14",
"-target-variant", "x86_64-apple-ios13.1-macabi",
Expand Down
6 changes: 3 additions & 3 deletions Tests/SwiftDriverTests/SwiftDriverToolingInterfaceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ final class SwiftDriverToolingInterfaceTests: XCTestCase {
diagnosticCallback: {_,_ in }))
}
do { // Force no outputs
let testCommand = "-module-name foo -emit-module -emit-module-path /tmp/foo.swiftmodule -emit-objc-header -emit-objc-header-path /tmp/foo.h -enable-library-evolution -emit-module-interface -emit-module-interface-path /tmp/foo.swiftinterface -emit-library -emit-tbd -emit-tbd-path /tmp/foo.tbd -emit-dependencies -serialize-diagnostics " + inputFile.description
let testCommand = "-swift-version 5 -module-name foo -emit-module -emit-module-path /tmp/foo.swiftmodule -emit-objc-header -emit-objc-header-path /tmp/foo.h -enable-library-evolution -emit-module-interface -emit-module-interface-path /tmp/foo.swiftinterface -emit-library -emit-tbd -emit-tbd-path /tmp/foo.tbd -emit-dependencies -serialize-diagnostics " + inputFile.description
var resultingFrontendArgs: [String] = []
var emittedDiagnostics: [Diagnostic] = []
XCTAssertFalse(getSingleFrontendInvocationFromDriverArgumentsV2(driverPath: "swiftc",
Expand Down Expand Up @@ -149,7 +149,7 @@ final class SwiftDriverToolingInterfaceTests: XCTestCase {
executor: executor))
}
do { // Force no outputs
let testCommand = "-module-name foo -emit-module -emit-module-path /tmp/foo.swiftmodule -emit-objc-header -emit-objc-header-path /tmp/foo.h -enable-library-evolution -emit-module-interface -emit-module-interface-path /tmp/foo.swiftinterface -emit-library -emit-tbd -emit-tbd-path /tmp/foo.tbd -emit-dependencies -serialize-diagnostics " + inputFile.description
let testCommand = "-swift-version 5 -module-name foo -emit-module -emit-module-path /tmp/foo.swiftmodule -emit-objc-header -emit-objc-header-path /tmp/foo.h -enable-library-evolution -emit-module-interface -emit-module-interface-path /tmp/foo.swiftinterface -emit-library -emit-tbd -emit-tbd-path /tmp/foo.tbd -emit-dependencies -serialize-diagnostics " + inputFile.description
var resultingFrontendArgs: [String] = []
var emittedDiagnostics: [Diagnostic] = []
XCTAssertFalse(getSingleFrontendInvocationFromDriverArgumentsV3(driverPath: "swiftc",
Expand Down Expand Up @@ -336,7 +336,7 @@ final class SwiftDriverToolingInterfaceTests: XCTestCase {
executor: executor))
}
do { // Force no outputs
let testCommand = "-module-name foo -emit-module -emit-module-path /tmp/foo.swiftmodule -emit-objc-header -emit-objc-header-path /tmp/foo.h -enable-library-evolution -emit-module-interface -emit-module-interface-path /tmp/foo.swiftinterface -emit-library -emit-tbd -emit-tbd-path /tmp/foo.tbd -emit-dependencies -serialize-diagnostics " + inputFile.description
let testCommand = "-swift-version 5 -module-name foo -emit-module -emit-module-path /tmp/foo.swiftmodule -emit-objc-header -emit-objc-header-path /tmp/foo.h -enable-library-evolution -emit-module-interface -emit-module-interface-path /tmp/foo.swiftinterface -emit-library -emit-tbd -emit-tbd-path /tmp/foo.tbd -emit-dependencies -serialize-diagnostics " + inputFile.description
var resultingFrontendArgs: [String] = []
var emittedDiagnostics: [Diagnostic] = []
XCTAssertFalse(getSingleFrontendInvocationFromDriverArgumentsV5(driverPath: "swiftc",
Expand Down