Merge pull request swiftlang#28445 from drodriguez/windows-fix-dependencies-tests

[windows] Adapt some Dependencies tests to Windows.

Author: compnerd

test/Driver/Dependencies/chained-private.swift

@@ -16,8 +16,7 @@
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | cat > %t/outputToCheck
-
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v >%t/outputToCheck 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-THIRD %s < %t/outputToCheck
 
 // Driver now schedules jobs in the order the inputs were given, but

test/Driver/Dependencies/only-skip-once.swift

@@ -4,15 +4,15 @@
 // RUN: cp -r %S/Inputs/only-skip-once/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %target-swiftc_driver -driver-show-job-lifecycle -output-file-map %t/output-file-map.json -incremental main.swift file1.swift file2.swift -j1 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %target-swiftc_driver -driver-show-job-lifecycle -output-file-map %t/output-file-map.json -incremental main.swift file1.swift file2.swift -j1 2>%t/stderr.txt | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL: Job finished: {compile: main.o <= main.swift}
 // CHECK-INITIAL: Job finished: {compile: file1.o <= file1.swift}
 // CHECK-INITIAL: Job finished: {compile: file2.o <= file2.swift}
 // CHECK-INITIAL: Job finished: {link: main <= main.o file1.o file2.o}
 
 // RUN: touch -t 201401240006 %t/file2.swift
-// RUN: cd %t && %target-swiftc_driver -driver-show-job-lifecycle -output-file-map %t/output-file-map.json -incremental main.swift file1.swift file2.swift -j1 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD %s
+// RUN: cd %t && %target-swiftc_driver -driver-show-job-lifecycle -output-file-map %t/output-file-map.json -incremental main.swift file1.swift file2.swift -j1 2>%t/stderr.txt | %FileCheck -check-prefix=CHECK-REBUILD %s
 
 // We should skip the main and file1 rebuilds here, but we should only note skipping them _once_
 // CHECK-REBUILD: Job finished: {compile: file2.o <= file2.swift}

test/Driver/Dependencies/range-lifecycle.swift

@@ -277,8 +277,8 @@
 
 // RUN: %FileCheck -check-prefix=CHECK-ADD-NEW-FILE %s < %t/output7
 
-// CHECK-ADD-NEW-FILE-DAG: unable to load swift ranges file "./fileC.swiftranges", No such file or directory
-// CHECK-ADD-NEW-FILE-DAG: unable to determine when 'fileC.compiledsource' was last modified: No such file or directory
+// CHECK-ADD-NEW-FILE-DAG: unable to load swift ranges file "./fileC.swiftranges", {{N|n}}o such file or directory
+// CHECK-ADD-NEW-FILE-DAG: unable to determine when 'fileC.compiledsource' was last modified: {{N|n}}o such file or directory
 // CHECK-ADD-NEW-FILE-DAG: Queuing <Dependencies> (initial): {compile: fileC.o <= fileC.swift}
 // CHECK-ADD-NEW-FILE-DAG: Using dependencies: At least one input ('fileC.swift') lacks a supplementary output needed for the source range strategy.
 // CHECK-ADD-NEW-FILE-DAG: Queuing <Dependencies> because of dependencies discovered later: {compile: fileB.o <= fileB.swift}