Skip to content

Commit 96b8620

Browse files
committed
Enable Explicit Module Build tests on Linux
They were waiting for the dependency scanner to learn how to query Clang dependency scanner without relying on Objective-C. This is now possible.
1 parent 5e9a1b5 commit 96b8620

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ private func pcmArgsEncodedRelativeModulePath(for moduleName: String, with pcmAr
163163
/// Test that for the given JSON module dependency graph, valid jobs are generated
164164
final class ExplicitModuleBuildTests: XCTestCase {
165165
func testModuleDependencyBuildCommandGeneration() throws {
166-
#if os(macOS)
167166
do {
168167
var driver = try Driver(args: ["swiftc", "-explicit-module-build",
169168
"-module-name", "testModuleDependencyBuildCommandGeneration",
@@ -222,7 +221,6 @@ final class ExplicitModuleBuildTests: XCTestCase {
222221
}
223222
}
224223
}
225-
#endif
226224
}
227225

228226
func testModuleDependencyBuildCommandGenerationWithExternalFramework() throws {
@@ -312,7 +310,6 @@ final class ExplicitModuleBuildTests: XCTestCase {
312310
/// Test generation of explicit module build jobs for dependency modules when the driver
313311
/// is invoked with -explicit-module-build
314312
func testExplicitModuleBuildJobs() throws {
315-
#if os(macOS)
316313
try withTemporaryDirectory { path in
317314
let main = path.appending(component: "testExplicitModuleBuildJobs.swift")
318315
try localFileSystem.writeFileContents(main) {
@@ -465,11 +462,9 @@ final class ExplicitModuleBuildTests: XCTestCase {
465462
}
466463
}
467464
}
468-
#endif
469465
}
470466

471467
func testImmediateModeExplicitModuleBuild() throws {
472-
#if os(macOS)
473468
try withTemporaryDirectory { path in
474469
let main = path.appending(component: "testExplicitModuleBuildJobs.swift")
475470
try localFileSystem.writeFileContents(main) {
@@ -598,7 +593,6 @@ final class ExplicitModuleBuildTests: XCTestCase {
598593
}
599594
}
600595
}
601-
#endif
602596
}
603597

604598

@@ -894,9 +888,6 @@ final class ExplicitModuleBuildTests: XCTestCase {
894888
}
895889

896890
func testExplicitModuleBuildEndToEnd() throws {
897-
// The macOS-only restriction is temporary while Clang's dependency scanner
898-
// is gaining the ability to perform name-based module lookup.
899-
#if os(macOS)
900891
try withTemporaryDirectory { path in
901892
try localFileSystem.changeCurrentWorkingDirectory(to: path)
902893
let main = path.appending(component: "testExplicitModuleBuildEndToEnd.swift")
@@ -924,7 +915,6 @@ final class ExplicitModuleBuildTests: XCTestCase {
924915
try driver.run(jobs: jobs)
925916
XCTAssertFalse(driver.diagnosticEngine.hasErrors)
926917
}
927-
#endif
928918
}
929919

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

0 commit comments

Comments
 (0)