Generalize disabled tests to also work on Apple Silicon #603
Conversation
…con, by explicitly specifying the SDK when run on Darwin.
| @@ -830,22 +822,30 @@ final class ExplicitModuleBuildTests: XCTestCase { | |||
| XCTAssertTrue(danglingJobs.allSatisfy { job in | |||
| job.moduleName == "MissingKit" | |||
| }) | |||
| XCTAssertTrue(jobs.count == 13) | |||
| 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.
| @@ -830,22 +822,30 @@ final class ExplicitModuleBuildTests: XCTestCase { | |||
| XCTAssertTrue(danglingJobs.allSatisfy { job in | |||
| job.moduleName == "MissingKit" | |||
| }) | |||
| XCTAssertTrue(jobs.count == 13) | |||
| XCTAssertTrue(jobs.count == 18) | |||
There was a problem hiding this comment.
Thank you for fixing this! The test updates look correct to me.
| @@ -821,7 +814,6 @@ final class ExplicitModuleBuildTests: XCTestCase { | |||
| var driver = try Driver(args: ["swiftc", main.pathString, | |||
There was a problem hiding this comment.
Do we really need to always use the host triple? Can we give a specific -target here to make the test arch-agnostic?
There was a problem hiding this comment.
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.
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.
artemcm
force-pushed
the
AppleSiliconTestRestore
branch
from
d587ab4 to
fd336b6
Compare
|
@swift-ci please test |
#599 and #602 disabled the following tests:
testDarwinBasictestSaveTempstestInputForwardingtestPrebuiltModuleGenerationJobsThis PR generalizes those tests to be agnostic to the macOS architecture and re-enables them on Apple Silicon.
The only remaining Apple Silicon-disabled test after this is:
testLitDriverDependenciesTests