Merge pull request swiftlang#21048 from compnerd/i-am-empty-inside

Author: swift-ci

test/Driver/Dependencies/README.txt

@@ -8,7 +8,8 @@ a --> b         File 'b' privately depends on file 'a' (normal dependencies casc
 
 Because of the way the tests are set up, the dependency information is put into the .swift files; any such test needs to start by "building" everything to copy that information into .swiftdeps files. To avoid timestamp issues, most of these tests start with:
 
-    // RUN: rm -rf %t && cp -r %S/Inputs/<TEST_GRAPH>/ %t
+    // RUN: %empty-directory(%t)
+    // RUN: cp -r %S/Inputs/<TEST_GRAPH>/* %t
     // RUN: touch -t 201401240005 %t/*
 
 
@@ -21,6 +22,7 @@ In order to correctly run these tests, the "before" information is put into .swi
 
 Most of these tests start with:
 
-    // RUN: rm -rf %t && cp -r %S/Inputs/<TEST_GRAPH>/ %t
+    // RUN: %empty-directory(%t)
+    // RUN: cp -r %S/Inputs/<TEST_GRAPH>/* %t
     // RUN: touch -t 201401240005 %t/*.swift
     // RUN: touch -t 201401240006 %t/*.o

test/Driver/Dependencies/bindings-build-record-options.swift

@@ -1,4 +1,5 @@
-// RUN: rm -rf %t && cp -r %S/Inputs/bindings-build-record/ %t
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/bindings-build-record/* %t
 // RUN: touch -t 201401240005 %t/*
 
 // RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=MUST-EXEC-INITIAL

test/Driver/Dependencies/bindings-build-record.swift

@@ -1,5 +1,6 @@
-// RUN: rm -rf %t && cp -r %S/Inputs/bindings-build-record/ %t
-// RUN: %S/Inputs/touch.py 443865900 %t/*
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/bindings-build-record/* %t
+// RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 
 // RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=MUST-EXEC
 

test/Driver/Dependencies/build-record-invalid.swift

@@ -1,4 +1,5 @@
-// RUN: rm -rf %t && cp -r %S/Inputs/bindings-build-record/ %t
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/bindings-build-record/* %t
 // RUN: touch -t 201401240005 %t/*
 
 // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s -check-prefix=CHECK-ALL-BUILT

test/Driver/Dependencies/chained-additional-kinds.swift

@@ -1,6 +1,7 @@
 // other ==> main ==> yet-another
 
-// RUN: rm -rf %t && cp -r %S/Inputs/chained-additional-kinds/ %t
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/chained-additional-kinds/* %t
 // RUN: touch -t 201401240005 %t/*
 
 // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %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 | %FileCheck -check-prefix=CHECK-FIRST %s

test/Driver/Dependencies/chained-after.swift

@@ -1,7 +1,8 @@
 /// other ==> main | yet-another
 /// other ==> main +==> yet-another
 
-// RUN: rm -rf %t && cp -r %S/Inputs/chained-after/ %t
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/chained-after/* %t
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...

test/Driver/Dependencies/chained-private-after-multiple-nominal-members.swift

@@ -1,7 +1,8 @@
 /// other --> main ==> yet-another
 /// other ==>+ main ==> yet-another
 
-// RUN: rm -rf %t && cp -r %S/Inputs/chained-private-after-multiple-nominal-members/ %t
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/chained-private-after-multiple-nominal-members/* %t
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...

test/Driver/Dependencies/chained-private-after-multiple.swift

@@ -1,7 +1,8 @@
 /// other --> main ==> yet-another
 /// other ==>+ main ==> yet-another
 
-// RUN: rm -rf %t && cp -r %S/Inputs/chained-private-after-multiple/ %t
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/chained-private-after-multiple/* %t
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...

test/Driver/Dependencies/chained-private-after.swift

@@ -1,7 +1,8 @@
 /// other --> main ==> yet-another
 /// other ==>+ main ==> yet-another
 
-// RUN: rm -rf %t && cp -r %S/Inputs/chained-private-after/ %t
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/chained-private-after/* %t
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...

test/Driver/Dependencies/chained-private.swift

@@ -1,6 +1,7 @@
 /// other --> main ==> yet-another
 
-// RUN: rm -rf %t && cp -r %S/Inputs/chained-private/ %t
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/chained-private/* %t
 // RUN: touch -t 201401240005 %t/*
 
 // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %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 | %FileCheck -check-prefix=CHECK-FIRST %s