Skip to content

Avoid generating an interface verification job for a package interface when no such interface is emitted #1497

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
Dec 2, 2023
Merged

Avoid generating an interface verification job for a package interface when no such interface is emitted #1497

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Sources/SwiftDriver/Jobs/Planning.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,9 @@ extension Driver {
}
try addVerifyJob(for: .Public)
try addVerifyJob(for: .Private)
try addVerifyJob(for: .Package)
if parsedOptions.hasArgument(.packageName) {
try addVerifyJob(for: .Package)
}
}

private mutating func addAutolinkExtractJob(
Expand Down
12 changes: 6 additions & 6 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2789,10 +2789,10 @@ final class SwiftDriverTests: XCTestCase {
// A .package.swiftinterface should only be generated if package-name is passed.
do {
var driver = try Driver(args: ["swiftc", "foo.swift", "-emit-module", "-module-name", "foo",
"-package-name", "mypkg",
"-package-name", "mypkg", "-library-level", "api",
"-emit-module-interface", "-enable-library-evolution"], env: envVars)
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 2)
XCTAssertEqual(plannedJobs.count, 3)
let emitInterfaceJob = plannedJobs[0]
XCTAssertTrue(emitInterfaceJob.commandLine.contains(.flag("-emit-module-interface-path")))
XCTAssertTrue(emitInterfaceJob.commandLine.contains(.flag("-emit-private-module-interface-path")))
Expand All @@ -2801,10 +2801,10 @@ final class SwiftDriverTests: XCTestCase {

// package-name is not passed, so package interface should not be generated.
do {
var driver = try Driver(args: ["swiftc", "foo.swift", "-emit-module", "-module-name", "foo",
var driver = try Driver(args: ["swiftc", "foo.swift", "-emit-module", "-module-name", "foo", "-library-level", "api",
"-emit-module-interface", "-enable-library-evolution"], env: envVars)
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 2)
XCTAssertEqual(plannedJobs.count, 3)
let emitInterfaceJob = plannedJobs[0]
XCTAssertTrue(emitInterfaceJob.commandLine.contains(.flag("-emit-module-interface-path")))
XCTAssertTrue(emitInterfaceJob.commandLine.contains(.flag("-emit-private-module-interface-path")))
Expand All @@ -2814,11 +2814,11 @@ final class SwiftDriverTests: XCTestCase {
// package-name is not passed, so specifying emit-package-module-interface-path should be a no-op.
do {
var driver = try Driver(args: ["swiftc", "foo.swift", "-emit-module", "-module-name", "foo",
"-emit-module-interface",
"-emit-module-interface", "-library-level", "api",
"-emit-package-module-interface-path", "foo.package.swiftinterface",
"-enable-library-evolution"], env: envVars)
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 2)
XCTAssertEqual(plannedJobs.count, 3)
let emitInterfaceJob = plannedJobs[0]
XCTAssertTrue(emitInterfaceJob.commandLine.contains(.flag("-emit-module-interface-path")))
XCTAssertTrue(emitInterfaceJob.commandLine.contains(.flag("-emit-private-module-interface-path")))
Expand Down