Skip to content

Commit 3ced1a3

Browse files
cachemeifyoucancachemeifyoucan
committed
Fix windows explicit module planning jobs
1 parent 6575f37 commit 3ced1a3

File tree

2 files changed

+56
-13
lines changed

2 files changed

+56
-13
lines changed

‎Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift‎

Lines changed: 46 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -485,16 +485,18 @@ final class ExplicitModuleBuildTests: XCTestCase {
485485

486486
let linkJob = try jobs.findJob(.link)
487487
if driver.targetTriple.isDarwin {
488-
XCTAssertTrue(linkJob.commandLine.contains("-possible-lswiftCore"))
489-
XCTAssertTrue(linkJob.commandLine.contains("-possible-lswift_StringProcessing"))
490-
XCTAssertTrue(linkJob.commandLine.contains("-possible-lobjc"))
491-
XCTAssertTrue(linkJob.commandLine.contains("-possible-lswift_Concurrency"))
492-
XCTAssertTrue(linkJob.commandLine.contains("-possible-lswiftSwiftOnoneSupport"))
488+
XCTAssertCommandLineContains(linkJob.commandLine, .flag("-possible-lswiftCore"))
489+
XCTAssertCommandLineContains(linkJob.commandLine, .flag("-possible-lswift_StringProcessing"))
490+
XCTAssertCommandLineContains(linkJob.commandLine, .flag("-possible-lobjc"))
491+
XCTAssertCommandLineContains(linkJob.commandLine, .flag("-possible-lswift_Concurrency"))
492+
XCTAssertCommandLineContains(linkJob.commandLine, .flag("-possible-lswiftSwiftOnoneSupport"))
493+
} else if driver.targetTriple.isWindows {
494+
XCTAssertCommandLineContains(linkJob.commandLine, .flag("-lswiftCore"))
493495
} else {
494-
XCTAssertTrue(linkJob.commandLine.contains("-lswiftCore"))
495-
XCTAssertTrue(linkJob.commandLine.contains("-lswift_StringProcessing"))
496-
XCTAssertTrue(linkJob.commandLine.contains("-lswift_Concurrency"))
497-
XCTAssertTrue(linkJob.commandLine.contains("-lswiftSwiftOnoneSupport"))
496+
XCTAssertCommandLineContains(linkJob.commandLine, .flag("-lswiftCore"))
497+
XCTAssertCommandLineContains(linkJob.commandLine, .flag("-lswift_StringProcessing"))
498+
XCTAssertCommandLineContains(linkJob.commandLine, .flag("-lswift_Concurrency"))
499+
XCTAssertCommandLineContains(linkJob.commandLine, .flag("-lswiftSwiftOnoneSupport"))
498500
}
499501
}
500502
}
@@ -610,6 +612,10 @@ final class ExplicitModuleBuildTests: XCTestCase {
610612
let dependencyGraph = try XCTUnwrap(driver.intermoduleDependencyGraph)
611613

612614
let checkForLinkLibrary = { (info: ModuleInfo, linkName: String, isFramework: Bool, shouldForceLoad: Bool) in
615+
if driver.targetTriple.isWindows && linkName != "swiftCore" {
616+
// Windows only links swiftCore.
617+
return
618+
}
613619
let linkLibraries = try XCTUnwrap(info.linkLibraries)
614620
let linkLibrary = try XCTUnwrap(linkLibraries.first { $0.linkName == linkName })
615621
XCTAssertEqual(linkLibrary.isFramework, isFramework)
@@ -773,6 +779,12 @@ final class ExplicitModuleBuildTests: XCTestCase {
773779
} else if relativeOutputPathFileName.starts(with: "_Builtin_stdint-") {
774780
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("_Builtin_stdint"),
775781
dependencyGraph: dependencyGraph)
782+
} else if relativeOutputPathFileName.starts(with: "vcruntime-") {
783+
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("vcruntime"),
784+
dependencyGraph: dependencyGraph)
785+
} else if relativeOutputPathFileName.starts(with: "SAL-") {
786+
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("SAL"),
787+
dependencyGraph: dependencyGraph)
776788
} else if hostTriple.isMacOSX,
777789
hostTriple.version(for: .macOS) < Triple.Version(11, 0, 0),
778790
relativeOutputPathFileName.starts(with: "X-") {
@@ -1135,6 +1147,12 @@ final class ExplicitModuleBuildTests: XCTestCase {
11351147
} else if relativeOutputPathFileName.starts(with: "_Builtin_stdint-") {
11361148
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("_Builtin_stdint"),
11371149
dependencyGraph: dependencyGraph)
1150+
} else if relativeOutputPathFileName.starts(with: "vcruntime-") {
1151+
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("vcruntime"),
1152+
dependencyGraph: dependencyGraph)
1153+
} else if relativeOutputPathFileName.starts(with: "SAL-") {
1154+
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("SAL"),
1155+
dependencyGraph: dependencyGraph)
11381156
} else {
11391157
XCTFail("Unexpected module dependency build job output: \(outputFilePath)")
11401158
}
@@ -1280,6 +1298,12 @@ final class ExplicitModuleBuildTests: XCTestCase {
12801298
} else if relativeOutputPathFileName.starts(with: "_Builtin_stdint-") {
12811299
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("_Builtin_stdint"),
12821300
dependencyGraph: dependencyGraph)
1301+
} else if relativeOutputPathFileName.starts(with: "vcruntime-") {
1302+
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("vcruntime"),
1303+
dependencyGraph: dependencyGraph)
1304+
} else if relativeOutputPathFileName.starts(with: "SAL-") {
1305+
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("SAL"),
1306+
dependencyGraph: dependencyGraph)
12831307
} else {
12841308
XCTFail("Unexpected module dependency build job output: \(outputFilePath)")
12851309
}
@@ -1400,6 +1424,12 @@ final class ExplicitModuleBuildTests: XCTestCase {
14001424
} else if relativeOutputPathFileName.starts(with: "_Builtin_stdint-") {
14011425
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("_Builtin_stdint"),
14021426
dependencyGraph: dependencyGraph)
1427+
} else if relativeOutputPathFileName.starts(with: "vcruntime-") {
1428+
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("vcruntime"),
1429+
dependencyGraph: dependencyGraph)
1430+
} else if relativeOutputPathFileName.starts(with: "SAL-") {
1431+
try checkExplicitModuleBuildJob(job: job, moduleId: .clang("SAL"),
1432+
dependencyGraph: dependencyGraph)
14031433
} else {
14041434
XCTFail("Unexpected module dependency build job output: \(outputFilePath)")
14051435
}
@@ -2689,6 +2719,9 @@ final class ExplicitModuleBuildTests: XCTestCase {
26892719

26902720
func testTraceDependency() throws {
26912721
try withTemporaryDirectory { path in
2722+
#if os(Windows)
2723+
throw XCTSkip("generatePCM error on windows")
2724+
#endif
26922725
try localFileSystem.changeCurrentWorkingDirectory(to: path)
26932726
let moduleCachePath = path.appending(component: "ModuleCache")
26942727
try localFileSystem.createDirectory(moduleCachePath)
@@ -2826,7 +2859,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
28262859
main.pathString])
28272860
let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
28282861
let emitModuleJob = try XCTUnwrap(plannedJobs.findJobs(.emitModule).spm_only)
2829-
XCTAssertTrue(emitModuleJob.commandLine.contains(subsequence: [.flag("-sdk"), .path(.absolute(mockSDKPath))]))
2862+
XCTAssertCommandLineContains(emitModuleJob.commandLine, .flag("-sdk"))
28302863
XCTAssertTrue(emitModuleJob.commandLine.contains(subsequence: [.flag("-clang-target"), .flag("x86_64-apple-macosx10.15")]))
28312864
}
28322865
}
@@ -2856,7 +2889,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
28562889
main.pathString])
28572890
let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
28582891
let emitModuleJob = try XCTUnwrap(plannedJobs.findJobs(.emitModule).spm_only)
2859-
XCTAssertTrue(emitModuleJob.commandLine.contains(subsequence: [.flag("-sdk"), .path(.absolute(mockSDKPath))]))
2892+
XCTAssertCommandLineContains(emitModuleJob.commandLine, .flag("-sdk"))
28602893
XCTAssertTrue(emitModuleJob.commandLine.contains(subsequence: [.flag("-clang-target"), .flag("x86_64-apple-macosx10.12")]))
28612894
}
28622895
}
@@ -2887,7 +2920,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
28872920
main.pathString])
28882921
let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
28892922
let emitModuleJob = try XCTUnwrap(plannedJobs.findJobs(.emitModule).spm_only)
2890-
XCTAssertTrue(emitModuleJob.commandLine.contains(subsequence: [.flag("-sdk"), .path(.absolute(mockSDKPath))]))
2923+
XCTAssertCommandLineContains(emitModuleJob.commandLine, .flag("-sdk"))
28912924
XCTAssertTrue(emitModuleJob.commandLine.contains(subsequence: [.flag("-clang-target"), .flag("x86_64-apple-macosx10.15")]))
28922925
XCTAssertTrue(emitModuleJob.commandLine.contains(subsequence: [.flag("-clang-target-variant"), .flag("x86_64-apple-ios13.1-macabi")]))
28932926
}
@@ -2920,7 +2953,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
29202953
main.pathString])
29212954
let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
29222955
let emitModuleJob = try XCTUnwrap(plannedJobs.findJobs(.emitModule).spm_only)
2923-
XCTAssertTrue(emitModuleJob.commandLine.contains(subsequence: [.flag("-sdk"), .path(.absolute(mockSDKPath))]))
2956+
XCTAssertCommandLineContains(emitModuleJob.commandLine, .flag("-sdk"))
29242957
XCTAssertTrue(emitModuleJob.commandLine.contains(subsequence: [.flag("-clang-target"), .flag("x86_64-apple-macosx10.12")]))
29252958
XCTAssertTrue(emitModuleJob.commandLine.contains(subsequence: [.flag("-clang-target-variant"), .flag("x86_64-apple-ios14.0-macabi")]))
29262959
}

‎Tests/SwiftDriverTests/SwiftDriverTests.swift‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3043,6 +3043,16 @@ final class SwiftDriverTests: XCTestCase {
30433043
let commonArgs = [
30443044
"swiftc", "foo.swift", "bar.swift", "-emit-executable", "-module-name", "Test", "-use-ld=lld"
30453045
]
3046+
#if os(Windows)
3047+
do {
3048+
var driver = try Driver(args: commonArgs + ["-sanitize=address"])
3049+
try XCTSkipUnless(driver.toolchain.runtimeLibraryExists(for: .address,
3050+
targetInfo: driver.frontendTargetInfo,
3051+
parsedOptions: &driver.parsedOptions,
3052+
isShared: false),
3053+
"sanitizer not supported in this windows environment")
3054+
}
3055+
#endif
30463056

30473057
#if os(macOS) || os(Windows)
30483058
do {

0 commit comments

Comments
 (0)