Merge pull request #909 from compnerd/runnable

Enable Running the test suite on Windows

Author: compnerd

Sources/SwiftDriver/Toolchains/Toolchain.swift

@@ -168,7 +168,7 @@ extension Toolchain {
       return path
     } else if let path = try? xcrunFind(executable: executable) {
       return path
-    } else if ![executableName("swift-frontend"), executableName("swift")].contains(executable),
+    } else if !["swift-frontend", "swift", "swift-frontend.exe", "swift.exe"].contains(executable),
               let parentDirectory = try? getToolPath(.swiftCompiler).parentDirectory,
               parentDirectory != executableDir,
               let path = lookupExecutablePath(filename: executable, searchPaths: [parentDirectory]) {

Tests/SwiftDriverTests/IncrementalCompilationTests.swift

@@ -135,6 +135,10 @@ extension IncrementalCompilationTests {
   /// autolink job.
   /// Much of the code below is taking from testLinking(), but uses the output file map code here.
   func testAutolinkOutputPath() {
+#if os(Windows)
+    XCTSkip("Driver.init fatalError")
+    return
+#endif
     var env = ProcessEnv.vars
     env["SWIFT_DRIVER_TESTS_ENABLE_EXEC_PATH_FALLBACK"] = "1"
     env["SWIFT_DRIVER_SWIFT_AUTOLINK_EXTRACT_EXEC"] = "/garbage/swift-autolink-extract"

Tests/SwiftDriverTests/JobExecutorTests.swift

@@ -288,6 +288,9 @@ final class JobExecutorTests: XCTestCase {
   }
 
   func testStubProcessProtocol() throws {
+#if os(Windows)
+    throw XCTSkip("processId.getter returning `-1`")
+#endif
     let job = Job(
       moduleName: "main",
       kind: .compile,
@@ -342,6 +345,9 @@ final class JobExecutorTests: XCTestCase {
   }
 
   func testInputModifiedDuringSingleJobBuild() throws {
+#if os(Windows)
+    throw XCTSkip("Requires -sdk")
+#endif
     try withTemporaryDirectory { path in
       let main = path.appending(component: "main.swift")
       try localFileSystem.writeFileContents(main) {
@@ -440,6 +446,9 @@ final class JobExecutorTests: XCTestCase {
     #if os(macOS)
     let toolchain = DarwinToolchain(env: ProcessEnv.vars, executor: executor)
     return try ["-sdk", toolchain.sdk.get().pathString]
+    #elseif os(Windows)
+    let toolchain = DarwinToolchain(env: ProcessEnv.vars, executor: executor)
+    return try ["-sdk", toolchain.sdk.get().pathString]
     #else
     return []
     #endif

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -38,6 +38,8 @@ final class SwiftDriverTests: XCTestCase {
     let toolchain: Toolchain
     #if os(macOS)
     toolchain = DarwinToolchain(env: ProcessEnv.vars, executor: executor)
+    #elseif os(Windows)
+    toolchain = WindowsToolchain(env: ProcessEnv.vars, executor: executor)
     #else
     toolchain = GenericUnixToolchain(env: ProcessEnv.vars, executor: executor)
     #endif
@@ -247,6 +249,9 @@ final class SwiftDriverTests: XCTestCase {
   }
 
   func testRecordedInputModificationDates() throws {
+#if os(Windows)
+    throw XCTSkip("TSCUtility.RelativePath failure")
+#endif
     try withTemporaryDirectory { path in
       guard let cwd = localFileSystem
         .currentWorkingDirectory else { fatalError() }
@@ -940,6 +945,9 @@ final class SwiftDriverTests: XCTestCase {
   }
 
   func testOutputFileMapRelativePathArg() throws {
+#if os(Windows)
+    throw XCTSkip("TSCUtility.RelativePath failure")
+#endif
     try withTemporaryDirectory { path in
       guard let cwd = localFileSystem
         .currentWorkingDirectory else { fatalError() }
@@ -985,7 +993,7 @@ final class SwiftDriverTests: XCTestCase {
       let args = try Driver.expandResponseFiles(["swift", "compiler", "-Xlinker", "@loader_path", "@" + fooPath.pathString, "something"], fileSystem: localFileSystem, diagnosticsEngine: diags)
       XCTAssertEqual(args, ["swift", "compiler", "-Xlinker", "@loader_path", "hello", "bye", "bye to you", "from", "bar", "something"])
       XCTAssertEqual(diags.diagnostics.count, 1)
-      XCTAssert(diags.diagnostics.first!.description.contains("is recursively expanded"))
+      XCTAssert(diags.diagnostics.first?.description.contains("is recursively expanded") ?? false)
     }
   }
 
@@ -2684,6 +2692,8 @@ final class SwiftDriverTests: XCTestCase {
     expectedDefaultContents = "-apple-macosx"
     #elseif os(Linux) || os(Android)
     expectedDefaultContents = "-unknown-linux"
+    #elseif os(Windows)
+    expectedDefaultContents = "-unknown-windows-msvc"
     #else
     expectedDefaultContents = "-"
     #endif
@@ -3776,6 +3786,8 @@ final class SwiftDriverTests: XCTestCase {
                                            env: ProcessEnv.vars)
     #if os(macOS)
     toolchain = DarwinToolchain(env: ProcessEnv.vars, executor: executor)
+    #elseif os(Windows)
+    toolchain = WindowsToolchain(env: ProcessEnv.vars, executor: executor)
     #else
     toolchain = GenericUnixToolchain(env: ProcessEnv.vars, executor: executor)
     #endif