Skip to content

Revert "Disable explicit module builds test #725" and fix the test. #727

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
merged 1 commit into from
Jun 23, 2021
Merged

Revert "Disable explicit module builds test #725" and fix the test. #727

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
10 changes: 6 additions & 4 deletions Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,6 @@ final class ExplicitModuleBuildTests: XCTestCase {
}

func testExplicitModuleBuildEndToEnd() throws {
throw XCTSkip("rdar://79594631")
/*
// The macOS-only restriction is temporary while Clang's dependency scanner
// is gaining the ability to perform name-based module lookup.
#if os(macOS)
Expand All @@ -605,19 +603,23 @@ final class ExplicitModuleBuildTests: XCTestCase {
let testInputsPath = packageRootPath + "/TestInputs"
let cHeadersPath : String = testInputsPath + "/ExplicitModuleBuilds/CHeaders"
let swiftModuleInterfacesPath : String = testInputsPath + "/ExplicitModuleBuilds/Swift"
let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
var driver = try Driver(args: ["swiftc",
"-I", cHeadersPath,
"-I", swiftModuleInterfacesPath,
"-experimental-explicit-module-build",
"-working-directory", path.pathString,
main.pathString],
// TODO: clang targets need to be taught
// how to work with explicit modules
// properly.
"-disable-clang-target",
main.pathString] + sdkArgumentsForTesting,
env: ProcessEnv.vars)
let jobs = try driver.planBuild()
try driver.run(jobs: jobs)
XCTAssertFalse(driver.diagnosticEngine.hasErrors)
}
#endif
*/
}

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