Skip to content

Commit 42e86f9

Browse files
committed
NFC: Use mock toolchain for swift-corelib-foundation workaround testing
1 parent 9f8cf31 commit 42e86f9

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

Sources/SPMTestSupport/MockBuildTestHelper.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ package struct MockToolchain: PackageModel.Toolchain {
3030
package let swiftCompilerPath = AbsolutePath("/fake/path/to/swiftc")
3131
package let includeSearchPaths = [AbsolutePath]()
3232
package let librarySearchPaths = [AbsolutePath]()
33-
package let swiftResourcesPath: AbsolutePath? = nil
33+
package let swiftResourcesPath: AbsolutePath?
3434
package let swiftStaticResourcesPath: AbsolutePath? = nil
3535
package let isSwiftDevelopmentToolchain = false
3636
package let sdkRootPath: AbsolutePath? = nil
@@ -51,7 +51,9 @@ package struct MockToolchain: PackageModel.Toolchain {
5151
#endif
5252
}
5353

54-
package init() {}
54+
package init(swiftResourcesPath: AbsolutePath? = nil) {
55+
self.swiftResourcesPath = swiftResourcesPath
56+
}
5557
}
5658

5759
extension Basics.Triple {

Tests/BuildTests/ClangTargetBuildDescriptionTests.swift

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,19 @@ final class ClangTargetBuildDescriptionTests: XCTestCase {
2525
}
2626

2727
func testSwiftCorelibsFoundationIncludeWorkaround() throws {
28-
let macosParameters = mockBuildParameters(
29-
toolchain: try UserToolchain.default,
30-
targetTriple: .macOS)
31-
let linuxParameters = mockBuildParameters(
32-
toolchain: try UserToolchain.default,
33-
targetTriple: .arm64Linux)
34-
let androidParameters = mockBuildParameters(
35-
toolchain: try UserToolchain.default,
36-
targetTriple: .arm64Android)
28+
let toolchain = MockToolchain(swiftResourcesPath: AbsolutePath("/fake/path/lib/swift"))
29+
30+
let macosParameters = mockBuildParameters(toolchain: toolchain, targetTriple: .macOS)
31+
let linuxParameters = mockBuildParameters(toolchain: toolchain, targetTriple: .arm64Linux)
32+
let androidParameters = mockBuildParameters(toolchain: toolchain, targetTriple: .arm64Android)
3733

3834
let macDescription = try makeTargetBuildDescription("swift-corelibs-foundation",
3935
buildParameters: macosParameters)
4036
XCTAssertFalse(try macDescription.basicArguments().contains("\(macosParameters.toolchain.swiftResourcesPath!)"))
4137

4238
let linuxDescription = try makeTargetBuildDescription("swift-corelibs-foundation",
4339
buildParameters: linuxParameters)
40+
print(try linuxDescription.basicArguments())
4441
XCTAssertTrue(try linuxDescription.basicArguments().contains("\(linuxParameters.toolchain.swiftResourcesPath!)"))
4542

4643
let androidDescription = try makeTargetBuildDescription("swift-corelibs-foundation",

0 commit comments

Comments
 (0)