Skip to content

Commit 788e6f9

Browse files
committed
Fix ExplicitModuleBuildTests: testExplicitLinkLibraries & testDependencyGraphDotSerialization
- testExplicitLinkLibraries to account for possibility of multiple link libraries per dependency - testDependencyGraphDotSerialization to account for possibility of discovering prebuilt modules for stdlib
1 parent 4b6c86a commit 788e6f9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
391391

392392
let checkForLinkLibrary = { (info: ModuleInfo, linkName: String, isFramework: Bool, shouldForceLoad: Bool) in
393393
let linkLibraries = try XCTUnwrap(info.linkLibraries)
394-
XCTAssertEqual(linkLibraries.count, 1)
395-
let linkLibrary = try XCTUnwrap(linkLibraries.first)
396-
XCTAssertEqual(linkLibrary.linkName, linkName)
394+
let linkLibrary = try XCTUnwrap(linkLibraries.first { $0.linkName == linkName })
397395
XCTAssertEqual(linkLibrary.isFramework, isFramework)
398396
XCTAssertEqual(linkLibrary.shouldForceLoad, shouldForceLoad)
399397
}
@@ -2090,9 +2088,11 @@ final class ExplicitModuleBuildTests: XCTestCase {
20902088
XCTAssertTrue(contents.contains("\"G\" [style=bold, color=orange"))
20912089
XCTAssertTrue(contents.contains("\"E\" [style=bold, color=orange, style=filled"))
20922090
XCTAssertTrue(contents.contains("\"C (C)\" [style=bold, color=lightskyblue, style=filled"))
2093-
XCTAssertTrue(contents.contains("\"Swift\" [style=bold, color=orange, style=filled"))
2091+
XCTAssertTrue(contents.contains("\"Swift\" [style=bold, color=orange, style=filled") ||
2092+
contents.contains("\"Swift (Prebuilt)\" [style=bold, color=darkorange3, style=filled"))
20942093
XCTAssertTrue(contents.contains("\"SwiftShims (C)\" [style=bold, color=lightskyblue, style=filled"))
2095-
XCTAssertTrue(contents.contains("\"Swift\" -> \"SwiftShims (C)\" [color=black];"))
2094+
XCTAssertTrue(contents.contains("\"Swift\" -> \"SwiftShims (C)\" [color=black];") ||
2095+
contents.contains("\"Swift (Prebuilt)\" -> \"SwiftShims (C)\" [color=black];"))
20962096
}
20972097
}
20982098

@@ -2237,7 +2237,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
22372237
let moduleCachePath = path.appending(component: "ModuleCache")
22382238
try localFileSystem.createDirectory(moduleCachePath)
22392239
let main = path.appending(component: "testTraceDependency.swift")
2240-
try localFileSystem.writeFileContents(main, bytes:
2240+
try localFileSystem.writeFileContents(main, bytes:
22412241
"""
22422242
import C;\
22432243
import E;\

0 commit comments

Comments
 (0)