[Testing] Try fix windows build

Author: cachemeifyoucan

Tests/SwiftDriverTests/Helpers/IncrementalTestHarness.swift

@@ -915,6 +915,7 @@ extension IncrementalTestHarness {
   }
 
   func doTheCompile(_ driver: inout Driver) {
+    touch(tempDir.appending(component: "timestamp"))
     let jobs = try! driver.planBuild()
     try? driver.run(jobs: jobs)
   }

Tests/SwiftDriverTests/IncrementalExplicitBuildTests.swift

@@ -91,6 +91,7 @@ struct IncrementalExplicitBuildTests: DiagVerifiable {
 
     let GInterfacePath = h.explicitSwiftDependenciesPath.appending(component: "G.swiftinterface")
     h.touch(GInterfacePath)
+    h.touch(GInterfacePath) // touch twice to make sure it is newer than build output.
 
     try h.doABuild(
       "update dependency (G) interface timestamp",
@@ -232,7 +233,8 @@ struct IncrementalExplicitBuildTests: DiagVerifiable {
 
     let EInterfacePath = h.explicitSwiftDependenciesPath.appending(component: "E.swiftinterface")
     // Just update the time-stamp of one of the module dependencies and use a value
-    // it is defined in.
+    // it is defined in. Touch twice to make sure it is newer than the build product.
+    h.touch(EInterfacePath)
     h.touch(EInterfacePath)
     h.replace(contentsOf: "other", with: "import E;let bar = foo + moduleEValue")
 
@@ -293,7 +295,8 @@ struct IncrementalExplicitBuildTests: DiagVerifiable {
     // Just update the time-stamp of one of the module dependencies' outputs.
     h.touch(pathToGModule)
     // Touch one of the inputs to actually trigger the incremental build.
-    h.touch(h.inputPath(basename: "other"))
+    try h.touch("other")
+    try h.touch("other") // touch twice to make sure it is newer than build output.
 
     try h.doABuild(
       "update dependency (G) result timestamp",
@@ -341,7 +344,8 @@ struct IncrementalExplicitBuildTests: DiagVerifiable {
     try h.buildInitialState(checkDiagnostics: false)
 
     // Touch one of the inputs to actually trigger the incremental build.
-    h.touch(h.inputPath(basename: "other"))
+    try h.touch("other")
+    try h.touch("other") // touch twice to make sure it is newer than build output.
 
     // Touch the output of a dependency of 'G', to ensure that it is newer than 'G', but 'G' still
     // does not get "invalidated".
@@ -399,7 +403,8 @@ struct IncrementalExplicitBuildTests: DiagVerifiable {
     try h.buildInitialState(checkDiagnostics: false)
 
     // Touch one of the inputs to actually trigger the incremental build.
-    h.touch(h.inputPath(basename: "other"))
+    try h.touch("other")
+    try h.touch("other") // touch twice to make sure it is newer than build output.
 
     // Touch 'G.swiftmodule' to trigger the dependency scanner to re-scan it.
     h.touch(newPathToGModule)

Tests/SwiftDriverTests/ToolchainTests.swift

@@ -188,15 +188,17 @@ import CRT
       try localFileSystem.createSymbolicLink(customSwiftFrontend, pointingAt: defaultSwiftFrontend, relative: false)
 
       try withTemporaryDirectory { tempDirectory in
+        let fs = TestLocalFileSystem(cwd: tempDirectory)
         let anotherSwiftFrontend = tempDirectory.appending(component: executableName("swift-frontend"))
-        try localFileSystem.createSymbolicLink(anotherSwiftFrontend, pointingAt: defaultSwiftFrontend, relative: false)
+        try fs.createSymbolicLink(anotherSwiftFrontend, pointingAt: defaultSwiftFrontend, relative: false)
 
         // test if SWIFT_DRIVER_TOOLNAME_EXEC is respected
         do {
           var driver = try Driver.forTesting(args: ["swiftc", "-print-target-info"],
                                   env: [PATH: ProcessEnv.path!,
                                         SWIFT_FRONTEND_EXEC: customSwiftFrontend.pathString,
-                                        SWIFT_SCANNER_LIB: customSwiftScan.pathString])
+                                        SWIFT_SCANNER_LIB: customSwiftScan.pathString],
+                                  fileSystem: fs)
           let jobs = try driver.planBuild()
           #expect(jobs.count == 1)
           expectEqual(jobs.first!.tool.name, customSwiftFrontend.pathString)
@@ -205,7 +207,8 @@ import CRT
         // test if tools directory is respected
         do {
           var driver = try Driver.forTesting(args: ["swiftc", "-print-target-info", "-tools-directory", toolsDirectory.pathString],
-                                  env: [PATH: tempDirectory.pathString, SWIFT_SCANNER_LIB: customSwiftScan.pathString])
+                                  env: [PATH: tempDirectory.pathString, SWIFT_SCANNER_LIB: customSwiftScan.pathString],
+                                  fileSystem: fs)
           let jobs = try driver.planBuild()
           #expect(jobs.count == 1)
           expectEqual(jobs.first!.tool.name, customSwiftFrontend.pathString)
@@ -219,8 +222,8 @@ import CRT
           let separator = ":"
 #endif
           var driver = try Driver.forTesting(args: ["swiftc", "-print-target-info"],
-                                  cwd: tempDirectory,
-                                  env: [PATH: [toolsDirectory.pathString, ProcessEnv.path!].joined(separator: separator), SWIFT_SCANNER_LIB: customSwiftScan.pathString])
+                                  env: [PATH: [toolsDirectory.pathString, ProcessEnv.path!].joined(separator: separator), SWIFT_SCANNER_LIB: customSwiftScan.pathString],
+                                  fileSystem: fs)
           let jobs = try driver.planBuild()
           #expect(jobs.count == 1)
           expectEqual(jobs.first!.tool.name, anotherSwiftFrontend.pathString)