Skip to content

Commit c880b52

Browse files
committed
Revert "Disable explicit module builds test #725" and fix the test.
Recent changes that introduced `-clang-target` have introduced a conflict with how explicit module builds work. We need to address this, but in the meantime, re-enable the test with `-disable-clang-target`. Resolves rdar://79594631
1 parent af5284c commit c880b52

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,8 +586,6 @@ final class ExplicitModuleBuildTests: XCTestCase {
586586
}
587587

588588
func testExplicitModuleBuildEndToEnd() throws {
589-
throw XCTSkip("rdar://79594631")
590-
/*
591589
// The macOS-only restriction is temporary while Clang's dependency scanner
592590
// is gaining the ability to perform name-based module lookup.
593591
#if os(macOS)
@@ -605,19 +603,23 @@ final class ExplicitModuleBuildTests: XCTestCase {
605603
let testInputsPath = packageRootPath + "/TestInputs"
606604
let cHeadersPath : String = testInputsPath + "/ExplicitModuleBuilds/CHeaders"
607605
let swiftModuleInterfacesPath : String = testInputsPath + "/ExplicitModuleBuilds/Swift"
606+
let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
608607
var driver = try Driver(args: ["swiftc",
609608
"-I", cHeadersPath,
610609
"-I", swiftModuleInterfacesPath,
611610
"-experimental-explicit-module-build",
612611
"-working-directory", path.pathString,
613-
main.pathString],
612+
// TODO: clang targets need to be taught
613+
// how to work with explicit modules
614+
// properly.
615+
"-disable-clang-target",
616+
main.pathString] + sdkArgumentsForTesting,
614617
env: ProcessEnv.vars)
615618
let jobs = try driver.planBuild()
616619
try driver.run(jobs: jobs)
617620
XCTAssertFalse(driver.diagnosticEngine.hasErrors)
618621
}
619622
#endif
620-
*/
621623
}
622624

623625
func getStdlibShimsPaths(_ driver: Driver) throws -> (AbsolutePath, AbsolutePath) {

0 commit comments

Comments
 (0)