Merge pull request #878 from daveinglis/building_tests_fixes_windows

Some fixes to get tests building on windows

Author: daveinglis

Sources/SWBUniversalPlatform/TestEntryPointGenerationTool.swift

@@ -25,7 +25,7 @@ final class TestEntryPointGenerationToolSpec: GenericCommandLineToolSpec, SpecId
             let format = cbc.scope.evaluate(BuiltinMacros.LINKER_FILE_LIST_FORMAT)
             args.append(contentsOf: ["--linker-file-list-format", .literal(.init(encodingAsUTF8: format.rawValue))])
 
-            for toolchainLibrarySearchPath in cbc.producer.toolchains.map({ $0.librarySearchPaths }) {
+            for toolchainLibrarySearchPath in cbc.producer.toolchains.map({ StackedSearchPath(paths: $0.librarySearchPaths.paths + $0.fallbackLibrarySearchPaths.paths, fs: $0.librarySearchPaths.fs) } ) {
                 if let path = toolchainLibrarySearchPath.findLibrary(operatingSystem: cbc.producer.hostOperatingSystem, basename: "IndexStore") {
                     args.append(contentsOf: ["--index-store-library-path", .path(path)])
                     break

Sources/SWBWindowsPlatform/Plugin.swift

@@ -161,7 +161,7 @@ struct WindowsSDKRegistryExtension: SDKRegistryExtension {
         guard case let .plDict(dict) = windowsSDKSettingsPlist else {
             throw StubError.error("Unexpected top-level property list type in \(windowsSDKSettingsPlistPath.str) (expected dictionary)")
         }
-
+        let testingLibraryPath = windowsPlatform.path.join("Developer").join("Library")
         let defaultProperties: [String: PropertyListItem] = [
             "GCC_GENERATE_DEBUGGING_SYMBOLS": .plString("NO"),
             "LD_DEPENDENCY_INFO_FILE": .plString(""),
@@ -170,7 +170,7 @@ struct WindowsSDKRegistryExtension: SDKRegistryExtension {
             "GENERATE_INTERMEDIATE_TEXT_BASED_STUBS": "NO",
 
             "LIBRARY_SEARCH_PATHS": "$(inherited) $(SDKROOT)/usr/lib/swift/windows/$(CURRENT_ARCH)",
-
+            "TEST_LIBRARY_SEARCH_PATHS": .plString("\(testingLibraryPath.strWithPosixSlashes)/Testing-$(SWIFT_TESTING_VERSION)/usr/lib/swift/windows/$(CURRENT_ARCH) \(testingLibraryPath.strWithPosixSlashes)/XCTest-$(XCTEST_VERSION)/usr/lib/swift/windows/$(CURRENT_ARCH)"),
             "OTHER_SWIFT_FLAGS": "$(inherited) -libc $(DEFAULT_USE_RUNTIME)",
 
             "DEFAULT_USE_RUNTIME": "MD",

Tests/SWBTaskConstructionTests/UnitTestTaskConstructionTests.swift

@@ -299,8 +299,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
         }
     }
 
-    @Test(.requireSDKs(.linux))
-    func unitTestRunnerTarget_linux() async throws {
+    @Test(.requireSDKs(.host), .skipHostOS(.macOS))
+    func unitTestRunnerTarget() async throws {
         let swiftCompilerPath = try await self.swiftCompilerPath
         let swiftVersion = try await self.swiftVersion
         let testProject = TestProject(
@@ -317,43 +317,45 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     buildSettings: [
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "linux",
+                        "SDKROOT": "auto",
                         "SWIFT_VERSION": swiftVersion,
                         "INDEX_DATA_STORE_DIR": "/index",
-                        "LINKER_DRIVER": "swiftc"
-                    ]),
+                        "LINKER_DRIVER": "swiftc",
+                    ])
             ],
             targets: [
                 TestStandardTarget(
                     "UnitTestRunner",
                     type: .swiftpmTestRunner,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [:])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(),
                         TestFrameworksBuildPhase([
-                            "UnitTestTarget.so"
-                        ])
+                            TestBuildFile(.target("UnitTestTarget"))
+                        ]),
                     ],
                     dependencies: ["UnitTestTarget"],
                 ),
                 TestStandardTarget(
                     "UnitTestTarget",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [:])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "TestOne.swift",
                             "TestTwo.swift",
-                        ]),
+                        ])
                     ],
                     dependencies: [],
-                    productReferenceName: "UnitTestTarget.so"
+                    productReferenceName: "$(EXCTABLE_NAME)"
                 ),
             ])
         let core = try await getCore()
@@ -363,15 +365,28 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
 
         try await fs.writeFileContents(swiftCompilerPath) { $0 <<< "binary" }
 
-        await tester.checkBuild(runDestination: .linux, fs: fs) { results in
+        await tester.checkBuild(runDestination: .host, fs: fs) { results in
             results.checkTarget("UnitTestRunner") { target in
                 results.checkTask(.matchTarget(target), .matchRuleType("GenerateTestEntryPoint")) { task in
-                    task.checkCommandLineMatches([.suffix("builtin-generateTestEntryPoint"), "--output", .suffix("test_entry_point.swift"), "--discover-tests", "--linker-file-list-format", .any, "--index-store-library-path", .suffix("libIndexStore.so"), "--linker-filelist", .suffix("UnitTestTarget.LinkFileList"), "--index-store", "/index", "--index-unit-base-path", "/tmp/Test/aProject/build"])
+                    task.checkCommandLineMatches([
+                        .suffix("builtin-generateTestEntryPoint"), 
+                        "--output", 
+                        .suffix("test_entry_point.swift"), 
+                        "--discover-tests", 
+                        "--linker-file-list-format", 
+                        .any,
+                        "--index-store-library-path", 
+                        .or(.suffix("libIndexStore.so"), .suffix("libIndexStore.dll")), 
+                        "--linker-filelist", .suffix("UnitTestTarget.LinkFileList"), 
+                        "--index-store", .equal(Path("/index").str),
+                        "--index-unit-base-path", 
+                        .equal(Path.root.join("/tmp/Test/aProject/build").str)
+                    ])
                     task.checkInputs([
                         .pathPattern(.suffix("UnitTestTarget.LinkFileList")),
-                        .pathPattern(.suffix("UnitTestTarget.so")),
+                        .pathPattern(.or(.suffix("UnitTestTarget.so"), .suffix("UnitTestTarget.dll"))),
+                        .namePattern(.any),
                         .namePattern(.any),
-                        .namePattern(.any)
                     ])
                     task.checkOutputs([.pathPattern(.suffix("test_entry_point.swift"))])
                 }