Skip to content

[TEST-ONLY] Simplify and speed up some explicit module build tests #2056

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
cachemeifyoucan merged 1 commit into from
Jan 14, 2026
Merged

[TEST-ONLY] Simplify and speed up some explicit module build tests #2056

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
5 changes: 2 additions & 3 deletions Tests/SwiftDriverTests/CachingBuildTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ final class CachingBuildTests: XCTestCase {
"-import-objc-header", bridgingHeaderpath.nativePathString(escaped: false),
main.nativePathString(escaped: false)] + sdkArgumentsForTesting)
let jobs = try driver.planBuild()
let dependencyGraph = try driver.scanModuleDependencies()
let dependencyGraph = try XCTUnwrap(driver.intermoduleDependencyGraph)
let mainModuleInfo = try dependencyGraph.moduleInfo(of: .swift("testCachingBuildJobs"))
guard case .swift(_) = mainModuleInfo.details else {
XCTFail("Main module does not have Swift details field")
Expand Down Expand Up @@ -496,8 +496,7 @@ final class CachingBuildTests: XCTestCase {
}

let jobs = try driver.planBuild()
// Figure out which Triples to use.
let dependencyGraph = try driver.scanModuleDependencies()
let dependencyGraph = try XCTUnwrap(driver.intermoduleDependencyGraph)
let mainModuleInfo = try dependencyGraph.moduleInfo(of: .swift("testExplicitModuleVerifyInterfaceJobs"))
guard case .swift(_) = mainModuleInfo.details else {
XCTFail("Main module does not have Swift details field")
Expand Down
12 changes: 4 additions & 8 deletions Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,8 +694,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
main.nativePathString(escaped: false)] + sdkArgumentsForTesting)

let jobs = try driver.planBuild()
// Figure out which Triples to use.
let dependencyGraph = try driver.scanModuleDependencies()
let dependencyGraph = try XCTUnwrap(driver.intermoduleDependencyGraph)
let mainModuleInfo = try dependencyGraph.moduleInfo(of: .swift("testExplicitModuleBuildJobs"))

guard case .swift(let mainModuleDetails) = mainModuleInfo.details else {
Expand Down Expand Up @@ -848,8 +847,8 @@ final class ExplicitModuleBuildTests: XCTestCase {
"-register-module-dependency", "G",
"-emit-loaded-module-trace",
main.nativePathString(escaped: false)] + sdkArgumentsForTesting)
let dependencyGraph = try driver.scanModuleDependencies()
let jobs = try driver.planBuild()
let dependencyGraph = try XCTUnwrap(driver.intermoduleDependencyGraph)
// E and G SHOULD be in the dependency graph (registered for scanning)
XCTAssertTrue(dependencyGraph.modules.keys.contains(.swift("E")),
"Module E should be in dependency graph when registered via -register-module-dependency")
Expand Down Expand Up @@ -1069,8 +1068,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
throw XCTSkip("-typecheck-module-from-interface doesn't support explicit build.")
}
let jobs = try driver.planBuild()
// Figure out which Triples to use.
let dependencyGraph = try driver.scanModuleDependencies()
let dependencyGraph = try XCTUnwrap(driver.intermoduleDependencyGraph)
let mainModuleInfo = try dependencyGraph.moduleInfo(of: .swift("testExplicitModuleVerifyInterfaceJobs"))
guard case .swift(_) = mainModuleInfo.details else {
XCTFail("Main module does not have Swift details field")
Expand Down Expand Up @@ -1227,8 +1225,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
"-pch-output-dir", pchOutputDir.nativePathString(escaped: false),
main.nativePathString(escaped: false)] + sdkArgumentsForTesting)
let jobs = try driver.planBuild()
// Figure out which Triples to use.
let dependencyGraph = try driver.scanModuleDependencies()
let dependencyGraph = try XCTUnwrap(driver.intermoduleDependencyGraph)
let mainModuleInfo = try dependencyGraph.moduleInfo(of: .swift("testExplicitModuleBuildPCHOutputJobs"))
guard case .swift(_) = mainModuleInfo.details else {
XCTFail("Main module does not have Swift details field")
Expand Down Expand Up @@ -1368,7 +1365,6 @@ final class ExplicitModuleBuildTests: XCTestCase {
// XCTAssertJobInvocationMatches(interpretJob, .flag("-disable-implicit-swift-modules"))
XCTAssertJobInvocationMatches(interpretJob, .flag("-Xcc"), .flag("-fno-implicit-modules"))

// Figure out which Triples to use.
let dependencyGraph = try driver.scanModuleDependencies()
let mainModuleInfo = try dependencyGraph.moduleInfo(of: .swift("testExplicitModuleBuildJobs"))
guard case .swift(_) = mainModuleInfo.details else {
Expand Down
Loading