Fixes many tests (plus skips) to get more tests running on windows

#8606

Author: daveinglis

Fixtures/DependencyResolution/External/Complex/FisherYates/src/Fisher-Yates_Shuffle.swift

@@ -1,12 +1,3 @@
-#if os(macOS) || os(iOS)
-import Darwin
-#elseif canImport(Glibc)
-import Glibc
-#elseif canImport(Musl)
-import Musl
-#elseif canImport(Bionic)
-import Bionic
-#endif
 
 public extension Collection {
     func shuffle() -> [Iterator.Element] {
@@ -24,15 +15,13 @@ public extension MutableCollection {
         guard c > 1 else { return }
 
         for (firstUnshuffled, unshuffledCount) in zip(indices, stride(from: c, to: 1, by: -1)) {
-#if os(macOS) || os(iOS)
-            let d = arc4random_uniform(numericCast(unshuffledCount))
-#else
-            let d = numericCast(random()) % unshuffledCount
-#endif
-            let i = index(firstUnshuffled, offsetBy: numericCast(d))
+            var g = SystemRandomNumberGenerator()
+            let d = Int.random(in: 1...unshuffledCount, using: &g)
+            let i = index(firstUnshuffled, offsetBy: d)
             swapAt(firstUnshuffled, i)
         }
     }
 }
 
+
 public let shuffle = false

Fixtures/Miscellaneous/EchoExecutable/Sources/secho/main.swift

@@ -4,8 +4,12 @@
 	import Musl
 #elseif canImport(Android)
 	import Android
-#else
+#elseif canImport(Darwin.C)
 	import Darwin.C
+#elseif canImport(ucrt)
+	import ucrt
+	let PATH_MAX = 260
+	typealias Int = Int32
 #endif
 
 let cwd = getcwd(nil, Int(PATH_MAX))

Fixtures/Miscellaneous/EchoExecutable/echo.bat

@@ -0,0 +1,2 @@
+echo sentinel
+echo %*

Fixtures/Miscellaneous/EchoExecutable/toolset.win32.json

@@ -0,0 +1,6 @@
+{
+  "debugger": { "path": "echo.bat" },
+  "testRunner": { "path": "echo.bat" },
+  "schemaVersion" : "1.0",
+  "rootPath" : "."
+}

Fixtures/Miscellaneous/PluginGeneratedResources/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 
 import PackageDescription
 

Fixtures/Miscellaneous/PluginGeneratedResources/Plugins/Generator/plugin.swift

@@ -1,9 +1,15 @@
 import PackagePlugin
+import Foundation
 
 #if os(Android)
 let touchExe = "/system/bin/touch"
+let touchArgs: [String] = []
+#elseif os(Windows)
+let touchExe = "C:/Windows/System32/cmd.exe"
+let touchArgs = ["/c", "copy", "NUL"]
 #else
 let touchExe = "/usr/bin/touch"
+let touchArgs: [String] = []
 #endif
 
 @main
@@ -12,9 +18,9 @@ struct GeneratorPlugin: BuildToolPlugin {
         return [
             .prebuildCommand(
                 displayName: "Generating empty file",
-                executable: .init(touchExe),
-                arguments: [context.pluginWorkDirectory.appending("best.txt")],
-                outputFilesDirectory: context.pluginWorkDirectory
+                executable: .init(fileURLWithPath: touchExe),
+                arguments: touchArgs + [String(cString: (context.pluginWorkDirectoryURL.appending(path: "best.txt") as NSURL).fileSystemRepresentation)],
+                outputFilesDirectory: context.pluginWorkDirectoryURL
             )
         ]
     }

Package.swift

@@ -946,6 +946,13 @@ let package = Package(
             dependencies: ["XCBuildSupport", "_InternalTestSupport", "_InternalBuildTestSupport"],
             exclude: ["Inputs/Foo.pc"]
         ),
+        .testTarget(
+            name: "FunctionalPerformanceTests",
+            dependencies: [
+                "swift-package-manager",
+                "_InternalTestSupport",
+            ]
+        ),
         // Examples (These are built to ensure they stay up to date with the API.)
         .executableTarget(
             name: "package-info",
@@ -964,19 +971,6 @@ package.targets.append(contentsOf: [
 ])
 #endif
 
-// Workaround SwiftPM's attempt to link in executables which does not work on all
-// platforms.
-#if !os(Windows)
-package.targets.append(contentsOf: [
-    .testTarget(
-        name: "FunctionalPerformanceTests",
-        dependencies: [
-            "swift-package-manager",
-            "_InternalTestSupport",
-        ]
-    ),
-])
-
 // rdar://101868275 "error: cannot find 'XCTAssertEqual' in scope" can affect almost any functional test, so we flat out
 // disable them all until we know what is going on
 if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] == nil {
@@ -989,7 +983,6 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
                 "_InternalTestSupport",
             ]
         ),
-
         .executableTarget(
             name: "dummy-swiftc",
             dependencies: [
@@ -1020,7 +1013,6 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
         ),
     ])
 }
-#endif
 
 
 func swiftSyntaxDependencies(_ names: [String]) -> [Target.Dependency] {

Sources/Build/LLBuildProgressTracker.swift

@@ -559,9 +559,14 @@ private struct CommandTaskTracker {
     }
 
     private func progressText(of command: SPMLLBuild.Command, targetName: String?) -> String {
+#if os(Windows)
+    let pathSep: Character = "\\"
+#else
+    let pathSep: Character = "/"
+#endif
         // Transforms descriptions like "Linking ./.build/x86_64-apple-macosx/debug/foo" into "Linking foo".
         if let firstSpaceIndex = command.description.firstIndex(of: " "),
-           let lastDirectorySeparatorIndex = command.description.lastIndex(of: "/")
+           let lastDirectorySeparatorIndex = command.description.lastIndex(of: pathSep)
         {
             let action = command.description[..<firstSpaceIndex]
             let fileNameStartIndex = command.description.index(after: lastDirectorySeparatorIndex)

Sources/_InternalTestSupport/SwiftPMProduct.swift

@@ -91,9 +91,9 @@ extension SwiftPM {
             packagePath: packagePath,
             env: env
         )
-        
-        let stdout = try result.utf8Output()
-        let stderr = try result.utf8stderrOutput()
+        //Remove /r from stdout/stderr so that tests do not have to deal with them
+        let stdout = try String(decoding: result.output.get().filter( { $0 != 13 }), as: Unicode.UTF8.self)
+        let stderr = try String(decoding: result.stderrOutput.get().filter( { $0 != 13 }), as: Unicode.UTF8.self)
 
         let returnValue = (stdout: stdout, stderr: stderr)
         if (!throwIfCommandFails) { return returnValue }

Sources/_InternalTestSupport/misc.swift

@@ -559,3 +559,20 @@ public func getNumberOfMatches(of match: String, in value: String) -> Int {
     guard match.count != 0 else { return 0 }
     return value.ranges(of: match).count
 }
+
+public extension String {
+    var withSwiftLineEnding: String {   
+        return replacingOccurrences(of: "\r\n", with: "\n")
+    }
+}
+
+public func executableName(_ name: String) -> String {
+#if os(Windows)
+  if name.count > 4, name.suffix(from: name.index(name.endIndex, offsetBy: -4)) == ProcessInfo.exeSuffix {
+    return name
+  }
+  return "\(name)\(ProcessInfo.exeSuffix)"
+#else
+  return name
+#endif
+}

Tests/BasicsTests/AsyncProcessTests.swift

@@ -144,11 +144,13 @@ final class AsyncProcessTests: XCTestCase {
     }
 
     func testFindExecutable() throws {
-        try XCTSkipOnWindows(because: "https://github.com/swiftlang/swift-package-manager/issues/8547: Assertion failure when trying to find ls executable")
-
         try testWithTemporaryDirectory { tmpdir in
             // This process should always work.
+            #if os(Windows)
+            XCTAssertTrue(AsyncProcess.findExecutable("cmd.exe") != nil)
+            #else
             XCTAssertTrue(AsyncProcess.findExecutable("ls") != nil)
+            #endif
 
             XCTAssertEqual(AsyncProcess.findExecutable("nonExistantProgram"), nil)
             XCTAssertEqual(AsyncProcess.findExecutable(""), nil)

Tests/BasicsTests/FileSystem/VFSTests.swift

@@ -17,8 +17,6 @@ import Testing
 
 import struct TSCBasic.ByteString
 
-import _InternalTestSupport // for XCTSkipOnWindows
-
 func testWithTemporaryDirectory(
     function: StaticString = #function,
     body: @escaping (AbsolutePath) async throws -> Void

Tests/CommandsTests/BuildCommandTests.swift

@@ -85,7 +85,7 @@ class BuildCommandTestCases: CommandsBuildProviderTestCase {
 
 
             if cleanAfterward {
-                try! await executeSwiftPackage(
+                try await executeSwiftPackage(
                     packagePath,
                     extraArgs: ["clean"],
                     buildSystem: buildSystemProvider
@@ -100,7 +100,7 @@ class BuildCommandTestCases: CommandsBuildProviderTestCase {
             )
         } catch {
             if cleanAfterward {
-                try! await executeSwiftPackage(
+                try await executeSwiftPackage(
                     packagePath,
                     extraArgs: ["clean"],
                     buildSystem: buildSystemProvider
@@ -233,7 +233,7 @@ class BuildCommandTestCases: CommandsBuildProviderTestCase {
 
             do {
                 let result = try await build(["--product", "exec1"], packagePath: fullPath)
-                XCTAssertMatch(result.binContents, ["exec1"])
+                XCTAssertMatch(result.binContents, [.equal(executableName("exec1"))])
                 XCTAssertNoMatch(result.binContents, ["exec2.build"])
             }
 
@@ -306,6 +306,8 @@ class BuildCommandTestCases: CommandsBuildProviderTestCase {
     }
 
     func testAtMainSupport() async throws {
+        try XCTSkipOnWindows(because: "https://github.com/swiftlang/swift-package-manager/issues/8658, needs investigation")
+
         try await fixture(name: "Miscellaneous/AtMainSupport") { fixturePath in
             let fullPath = try resolveSymlinks(fixturePath)
 
@@ -316,12 +318,12 @@ class BuildCommandTestCases: CommandsBuildProviderTestCase {
 
             do {
                 let result = try await build(["--product", "SwiftExecSingleFile"], packagePath: fullPath)
-                XCTAssertMatch(result.binContents, ["SwiftExecSingleFile"])
+                XCTAssertMatch(result.binContents, [.equal(executableName("SwiftExecSingleFile"))])
             }
 
             do {
                 let result = try await build(["--product", "SwiftExecMultiFile"], packagePath: fullPath)
-                XCTAssertMatch(result.binContents, ["SwiftExecMultiFile"])
+                XCTAssertMatch(result.binContents, [.equal(executableName("SwiftExecMultiFile"))])
             }
         }
     }
@@ -343,8 +345,8 @@ class BuildCommandTestCases: CommandsBuildProviderTestCase {
             do {
                 let result = try await build(["--product", "bexec"], packagePath: aPath)
                 XCTAssertMatch(result.binContents, ["BTarget2.build"])
-                XCTAssertMatch(result.binContents, ["bexec"])
-                XCTAssertNoMatch(result.binContents, ["aexec"])
+                XCTAssertMatch(result.binContents, [.equal(executableName("bexec"))])
+                XCTAssertNoMatch(result.binContents, [.equal(executableName("aexec"))])
                 XCTAssertNoMatch(result.binContents, ["ATarget.build"])
                 XCTAssertNoMatch(result.binContents, ["BLibrary.a"])
 
@@ -541,6 +543,8 @@ class BuildCommandTestCases: CommandsBuildProviderTestCase {
     }
 
     func testSwiftGetVersion() async throws {
+        try XCTSkipOnWindows(because: "https://github.com/swiftlang/swift-package-manager/issues/8659, SWIFT_EXEC override is not working")
+
         try await fixture(name: "Miscellaneous/Simple") { fixturePath in
             func findSwiftGetVersionFile() throws -> AbsolutePath {
                 let buildArenaPath = fixturePath.appending(components: ".build", "debug")
@@ -678,7 +682,7 @@ class BuildCommandTestCases: CommandsBuildProviderTestCase {
         }
     }
 
-#if !canImport(Darwin)
+#if os(Linux)
     func testIgnoresLinuxMain() async throws {
         try await fixture(name: "Miscellaneous/TestDiscovery/IgnoresLinuxMain") { fixturePath in
             let buildResult = try await self.build(["-v", "--build-tests", "--enable-test-discovery"], packagePath: fixturePath, cleanAfterward: false)
@@ -774,15 +778,10 @@ class BuildCommandNativeTests: BuildCommandTestCases {
                 components: ".build",
                 UserToolchain.default.targetTriple.platformBuildPathComponent
             )
-            try await XCTAssertAsyncEqual(
-                try await self.execute(["--show-bin-path"], packagePath: fullPath).stdout,
-                "\(targetPath.appending("debug").pathString)\n"
-            )
-            try await XCTAssertAsyncEqual(
-                try await self.execute(["-c", "release", "--show-bin-path"], packagePath: fullPath)
-                    .stdout,
-                "\(targetPath.appending("release").pathString)\n"
-            )
+            let debugPath = try await self.execute(["--show-bin-path"], packagePath: fullPath).stdout.trimmingCharacters(in: .whitespacesAndNewlines)
+            XCTAssertEqual(AbsolutePath(debugPath).pathString, targetPath.appending("debug").pathString)
+            let releasePath = try await self.execute(["-c", "release", "--show-bin-path"], packagePath: fullPath).stdout.trimmingCharacters(in: .whitespacesAndNewlines)
+            XCTAssertEqual(AbsolutePath(releasePath).pathString, targetPath.appending("release").pathString)
         }
     }
 }
@@ -885,9 +884,9 @@ class BuildCommandSwiftBuildTests: BuildCommandTestCases {
                 UserToolchain.default.targetTriple.platformBuildPathComponent
             )
             let debugPath = try await self.execute(["--show-bin-path"], packagePath: fullPath).stdout
-            XCTAssertMatch(debugPath, .regex(targetPath.appending(components: "Products", "Debug").pathString + "(\\-linux|\\-Windows)?\\n"))
+            XCTAssertMatch(AbsolutePath(debugPath).pathString, .regex(targetPath.appending(components: "Products", "Debug").escapedPathString + "(\\-linux|\\-Windows)?"))
             let releasePath = try await self.execute(["-c", "release", "--show-bin-path"], packagePath: fullPath).stdout
-            XCTAssertMatch(releasePath, .regex(targetPath.appending(components: "Products", "Release").pathString + "(\\-linux|\\-Windows)?\\n"))
+            XCTAssertMatch(AbsolutePath(releasePath).pathString, .regex(targetPath.appending(components: "Products", "Release").escapedPathString + "(\\-linux|\\-Windows)?"))
         }
     }
 
@@ -923,7 +922,7 @@ class BuildCommandSwiftBuildTests: BuildCommandTestCases {
         throw XCTSkip("SWBINTTODO: Test fails because of a difference in the build layout. This needs to be updated to the expected path")
     }
 
-#if !canImport(Darwin)
+#if os(Linux)
     override func testIgnoresLinuxMain() async throws {
         throw XCTSkip("SWBINTTODO: Swift build doesn't currently ignore Linux main when linking on Linux. This needs further investigation.")
     }

Tests/CommandsTests/MultiRootSupportTests.swift

@@ -42,6 +42,6 @@ final class MultiRootSupportTests: CommandsTestCase {
         let result = try XcodeWorkspaceLoader(fileSystem: fs, observabilityScope: observability.topScope).load(workspace: path)
 
         XCTAssertNoDiagnostics(observability.diagnostics)
-        XCTAssertEqual(result.map{ $0.pathString }.sorted(), ["/tmp/test/dep", "/tmp/test/local"])
+        XCTAssertEqual(result.map{ $0.pathString }.sorted(), [AbsolutePath("/tmp/test/dep").pathString, AbsolutePath("/tmp/test/local").pathString])
     }
 }