Merge pull request #36769 from davidungar/fix-lit-tests-for-driver-fix

[Incremental] Revise lit tests that were broken in swiftlang/swift-driver#580

Author: David Ungar

test/Driver/Dependencies/dependencies-preservation-fine.swift

@@ -2,8 +2,6 @@
 // Verify that the top-level build record file from the last incremental
 // compilation is preserved with the same name, suffixed by a '~'.
 
-// REQUIRES: rdar76238077
-
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
@@ -16,7 +14,7 @@
 // RUN: %FileCheck -check-prefix CHECK-OVERWRITTEN %s < main~buildrecord.swiftdeps
 // CHECK-OVERWRITTEN: version: "{{.*}}"
 // CHECK-OVERWRITTEN: options: "{{.*}}"
-// CHECK-OVERWRITTEN: build_time: [{{[0-9]*}}, {{[0-9]*}}]
+// CHECK-OVERWRITTEN: build_{{(start_)?}}time: [{{[0-9]*}}, {{[0-9]*}}]
 // CHECK-OVERWRITTEN: inputs:
 // CHECK-OVERWRITTEN: "{{(./)?}}main.swift": [443865900, 0]
 // CHECK-OVERWRITTEN: "{{(./)?}}other.swift": [443865900, 0]

test/Driver/Dependencies/one-way-merge-module-fine.swift

@@ -1,7 +1,5 @@
 /// other ==> main
 
-// REQUIRES: rdar76238077
-
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
@@ -14,7 +12,7 @@
 // CHECK-FIRST: Produced master.swiftmodule
 
 // swift-driver checks existence of all outputs
-// RUN: touch -t 201401240006 %t/{main,other}.swift{module,doc,sourceinfo}
+// RUN: touch -t 201401240006 %t/{main,other,master}.swift{module,doc,sourceinfo}
 
 // RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s