Generalize disabled tests to also work on Apple Silicon #603
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // swift-interface-format-version: 1.0 | ||
| // swift-module-flags: -module-name A | ||
| import Swift | ||
| public func FuncA() { } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // swift-interface-format-version: 1.0 | ||
| // swift-module-flags: -module-name E | ||
| import Swift | ||
| public func FuncE() { } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| // swift-interface-format-version: 1.0 | ||
| // swift-module-flags: -module-name G | ||
| import Swift | ||
| import E | ||
| public func FuncG() { } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| // swift-interface-format-version: 1.0 | ||
| // swift-module-flags: -module-name H | ||
| import Swift | ||
| import A | ||
| import E | ||
| import F | ||
| import G | ||
| public func FuncH() { } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| // swift-interface-format-version: 1.0 | ||
| // swift-module-flags: -parse-stdlib -module-name Swift |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -754,12 +754,6 @@ final class ExplicitModuleBuildTests: XCTestCase { | |
| // We only care about prebuilt modules in macOS. | ||
| #if os(macOS) | ||
| func testPrebuiltModuleGenerationJobs() throws { | ||
| func getInputModules(_ job: Job) -> [String] { | ||
| return job.inputs.map { input in | ||
| return input.file.absolutePath!.parentDirectory.basenameWithoutExt | ||
|
|
@@ -791,7 +785,6 @@ final class ExplicitModuleBuildTests: XCTestCase { | |
| job.outputs[0].file.basenameWithoutExt == basenameWithoutExt | ||
| } | ||
| } | ||
| let packageRootPath = URL(fileURLWithPath: #file).pathComponents | ||
| .prefix(while: { $0 != "Tests" }).joined(separator: "/").dropFirst() | ||
| let testInputsPath = packageRootPath + "/TestInputs" | ||
|
|
@@ -801,12 +794,12 @@ final class ExplicitModuleBuildTests: XCTestCase { | |
| let interfaceMap = try collector.collectSwiftInterfaceMap() | ||
|
|
||
| // Check interface map always contain everything | ||
| XCTAssertTrue(interfaceMap["Swift"]!.count == 3) | ||
| XCTAssertTrue(interfaceMap["A"]!.count == 3) | ||
| XCTAssertTrue(interfaceMap["E"]!.count == 3) | ||
| XCTAssertTrue(interfaceMap["F"]!.count == 3) | ||
| XCTAssertTrue(interfaceMap["G"]!.count == 3) | ||
| XCTAssertTrue(interfaceMap["H"]!.count == 3) | ||
|
|
||
| try withTemporaryDirectory { path in | ||
| let main = path.appending(component: "testPrebuiltModuleGenerationJobs.swift") | ||
|
|
@@ -821,7 +814,6 @@ final class ExplicitModuleBuildTests: XCTestCase { | |
| var driver = try Driver(args: ["swiftc", main.pathString, | ||
| "-sdk", mockSDKPath, | ||
| ]) | ||
| let (jobs, danglingJobs) = try driver.generatePrebuitModuleGenerationJobs(with: interfaceMap, | ||
| into: VirtualPath(path: "/tmp/").absolutePath!, | ||
| exhaustive: true) | ||
|
|
@@ -830,22 +822,30 @@ final class ExplicitModuleBuildTests: XCTestCase { | |
| XCTAssertTrue(danglingJobs.allSatisfy { job in | ||
| job.moduleName == "MissingKit" | ||
| }) | ||
| XCTAssertTrue(jobs.count == 18) | ||
|
There was a problem hiding this comment. @nkcsgexi , I may not have the full context for some of the things being tested here so please take a look to ensure it's still testing the right thing. There was a problem hiding this comment. Thank you for fixing this! The test updates look correct to me. |
||
| XCTAssertTrue(jobs.allSatisfy {$0.outputs.count == 1}) | ||
| XCTAssertTrue(jobs.allSatisfy {$0.kind == .compile}) | ||
| XCTAssertTrue(jobs.allSatisfy {$0.commandLine.contains(.flag("-compile-module-from-interface"))}) | ||
| let HJobs = jobs.filter { $0.moduleName == "H"} | ||
| XCTAssertTrue(HJobs.count == 3) | ||
| // arm64 | ||
| XCTAssertTrue(getInputModules(HJobs[0]) == ["A", "A", "E", "E", "F", "F", "G", "G", "Swift", "Swift"]) | ||
| // arm64e | ||
| XCTAssertTrue(getInputModules(HJobs[1]) == ["A", "E", "F", "G", "Swift"]) | ||
| // x86_64 | ||
| XCTAssertTrue(getInputModules(HJobs[2]) == ["A", "E", "F", "G", "Swift"]) | ||
| XCTAssertTrue(getOutputName(HJobs[0]) != getOutputName(HJobs[1])) | ||
| XCTAssertTrue(getOutputName(HJobs[1]) != getOutputName(HJobs[2])) | ||
| checkInputOutputIntegrity(HJobs[0]) | ||
| checkInputOutputIntegrity(HJobs[1]) | ||
| checkInputOutputIntegrity(HJobs[2]) | ||
| let GJobs = jobs.filter { $0.moduleName == "G"} | ||
| XCTAssertTrue(GJobs.count == 3) | ||
| XCTAssertTrue(getInputModules(GJobs[0]) == ["E", "E", "Swift", "Swift"]) | ||
| XCTAssertTrue(getInputModules(GJobs[1]) == ["E", "Swift"]) | ||
| XCTAssertTrue(getInputModules(GJobs[2]) == ["E", "Swift"]) | ||
| XCTAssertTrue(getOutputName(GJobs[0]) != getOutputName(GJobs[1])) | ||
| XCTAssertTrue(getOutputName(GJobs[1]) != getOutputName(GJobs[2])) | ||
| checkInputOutputIntegrity(GJobs[0]) | ||
| checkInputOutputIntegrity(GJobs[1]) | ||
| } | ||
|
|
@@ -857,28 +857,33 @@ final class ExplicitModuleBuildTests: XCTestCase { | |
| var driver = try Driver(args: ["swiftc", main.pathString, | ||
| "-sdk", mockSDKPath, | ||
| ]) | ||
| let (jobs, danglingJobs) = try driver.generatePrebuitModuleGenerationJobs(with: interfaceMap, | ||
| into: VirtualPath(path: "/tmp/").absolutePath!, | ||
| exhaustive: false) | ||
|
|
||
| XCTAssertTrue(danglingJobs.isEmpty) | ||
| XCTAssertTrue(jobs.count == 18) | ||
| XCTAssertTrue(jobs.allSatisfy {$0.outputs.count == 1}) | ||
| XCTAssertTrue(jobs.allSatisfy {$0.kind == .compile}) | ||
| XCTAssertTrue(jobs.allSatisfy {$0.commandLine.contains(.flag("-compile-module-from-interface"))}) | ||
| let HJobs = jobs.filter { $0.moduleName == "H"} | ||
| XCTAssertTrue(HJobs.count == 3) | ||
| // arm64 | ||
| XCTAssertTrue(getInputModules(HJobs[0]) == ["A", "A", "E", "E", "F", "F", "G", "G", "Swift", "Swift"]) | ||
| // arm64e | ||
| XCTAssertTrue(getInputModules(HJobs[1]) == ["A", "E", "F", "G", "Swift"]) | ||
| // x86_64 | ||
| XCTAssertTrue(getInputModules(HJobs[2]) == ["A", "E", "F", "G", "Swift"]) | ||
| XCTAssertTrue(getOutputName(HJobs[0]) != getOutputName(HJobs[1])) | ||
| checkInputOutputIntegrity(HJobs[0]) | ||
| checkInputOutputIntegrity(HJobs[1]) | ||
| let GJobs = jobs.filter { $0.moduleName == "G"} | ||
| XCTAssertTrue(GJobs.count == 3) | ||
| XCTAssertTrue(getInputModules(GJobs[0]) == ["E", "E", "Swift", "Swift"]) | ||
| XCTAssertTrue(getInputModules(GJobs[1]) == ["E", "Swift"]) | ||
| XCTAssertTrue(getInputModules(GJobs[2]) == ["E", "Swift"]) | ||
| XCTAssertTrue(getOutputName(GJobs[0]) != getOutputName(GJobs[1])) | ||
| XCTAssertTrue(getOutputName(GJobs[1]) != getOutputName(GJobs[2])) | ||
| checkInputOutputIntegrity(GJobs[0]) | ||
| checkInputOutputIntegrity(GJobs[1]) | ||
| } | ||
|
|
@@ -890,13 +895,12 @@ final class ExplicitModuleBuildTests: XCTestCase { | |
| var driver = try Driver(args: ["swiftc", main.pathString, | ||
| "-sdk", mockSDKPath, | ||
| ]) | ||
| let (jobs, danglingJobs) = try driver.generatePrebuitModuleGenerationJobs(with: interfaceMap, | ||
| into: VirtualPath(path: "/tmp/").absolutePath!, | ||
| exhaustive: false) | ||
|
|
||
| XCTAssertTrue(danglingJobs.isEmpty) | ||
| XCTAssert(jobs.count == 3) | ||
| XCTAssert(jobs.allSatisfy { $0.moduleName == "Swift" }) | ||
| } | ||
| try withTemporaryDirectory { path in | ||
|
|
@@ -907,13 +911,12 @@ final class ExplicitModuleBuildTests: XCTestCase { | |
| var driver = try Driver(args: ["swiftc", main.pathString, | ||
| "-sdk", mockSDKPath, | ||
| ]) | ||
| let (jobs, danglingJobs) = try driver.generatePrebuitModuleGenerationJobs(with: interfaceMap, | ||
| into: VirtualPath(path: "/tmp/").absolutePath!, | ||
| exhaustive: false) | ||
|
|
||
| XCTAssertTrue(danglingJobs.isEmpty) | ||
| XCTAssertTrue(jobs.count == 9) | ||
| jobs.forEach({ job in | ||
| // Check we don't pull in other modules than A, F and Swift | ||
| XCTAssertTrue(["A", "F", "Swift"].contains(job.moduleName)) | ||
|
|
@@ -928,7 +931,6 @@ final class ExplicitModuleBuildTests: XCTestCase { | |
| var driver = try Driver(args: ["swiftc", main.pathString, | ||
| "-sdk", mockSDKPath, | ||
| ]) | ||
| let (jobs, _) = try driver.generatePrebuitModuleGenerationJobs(with: interfaceMap, | ||
| into: VirtualPath(path: "/tmp/").absolutePath!, | ||
| exhaustive: false) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we really need to always use the host triple? Can we give a specific
-targethere to make the test arch-agnostic?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm having a hard time reproducing the original CI failures for this test so I'm investigating why that may be.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I finally reproduced this locally, and the failure is because these are some of the few tests actually need to link to succeed (as opposed to just invoking the driver and inspecting the generated jobs). And when being tested with a just-built compiler, we do not have a fully-formed fat toolchain, we just have the host slice of everything.
So I think in this case it's simpler to just compile for the host to make sure these tests are still exercised on whatever platform we are testing on.