Skip to content

test: use %empty-directory more aggressively #21048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2018
Merged

test: use %empty-directory more aggressively #21048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions test/Driver/Dependencies/README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*


Expand All @@ -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
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/bindings-build-record-options.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 3 additions & 2 deletions test/Driver/Dependencies/bindings-build-record.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/build-record-invalid.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/chained-additional-kinds.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/chained-after.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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...
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/chained-private-after-multiple-nominal-members.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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...
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/chained-private-after-multiple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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...
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/chained-private-after.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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...
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/chained-private.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/chained.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// other ==> main ==> yet-another

// RUN: rm -rf %t && cp -r %S/Inputs/chained/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/chained/* %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
Expand Down
6 changes: 4 additions & 2 deletions test/Driver/Dependencies/crash-added.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// crash ==> main | crash --> other

// RUN: rm -rf %t && cp -r %S/Inputs/crash-simple/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/crash-simple/* %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 -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
Expand All @@ -21,7 +22,8 @@
// CHECK-RECORD-ADDED-DAG: "./other.swift": [


// RUN: rm -rf %t && cp -r %S/Inputs/crash-simple/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/crash-simple/* %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 -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/crash-new.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// crash ==> main | crash --> other

// RUN: rm -rf %t && cp -r %S/Inputs/crash-simple/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/crash-simple/* %t
// RUN: touch -t 201401240005 %t/*

// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/crash-simple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// crash ==> main | crash --> other

// RUN: rm -rf %t && cp -r %S/Inputs/crash-simple/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/crash-simple/* %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 ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/dependencies-preservation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Verify that the top-level build record file from the last incremental
// compilation is preserved with the same name, suffixed by a '~'.

// RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/one-way/* %t
// RUN: %S/Inputs/touch.py 443865900 %t/*
// RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
// RUN: cd %t && %swiftc_driver -driver-use-frontend-path %S/Inputs/update-dependencies.py -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/driver-show-incremental-arguments.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
// is disabled.


// RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/one-way/* %t
// RUN: %S/Inputs/touch.py 443865900 %t/*
// RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps

Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/driver-show-incremental-conflicting-arguments.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
// is disabled. If both are specified, the driver should only print one message.


// RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/one-way/* %t
// RUN: %S/Inputs/touch.py 443865900 %t/*
// RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps

Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/driver-show-incremental-inputs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
// is disabled.


// RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/one-way/* %t
// RUN: %S/Inputs/touch.py 443865900 %t/*
// RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps

Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/driver-show-incremental-malformed.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
// is disabled.


// RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/one-way/* %t
// RUN: %S/Inputs/touch.py 443865900 %t/*

// RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/driver-show-incremental-mutual.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// main <==> other

// RUN: rm -rf %t && cp -r %S/Inputs/mutual/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/mutual/* %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 -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/driver-show-incremental-swift-version.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
// is disabled.


// RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/one-way/* %t
// RUN: %S/Inputs/touch.py 443865900 %t/*

// RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/embed-bitcode-parallel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/one-way/* %t
// RUN: touch -t 201401240005 %t/*

// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/fake-build-for-bitcode.py -output-file-map %t/output.json -incremental ./main.swift ./other.swift -embed-bitcode -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down
6 changes: 4 additions & 2 deletions test/Driver/Dependencies/fail-added.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// bad ==> main | bad --> other

// RUN: rm -rf %t && cp -r %S/Inputs/fail-simple/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/fail-simple/* %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 -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
Expand All @@ -21,7 +22,8 @@
// CHECK-RECORD-ADDED-DAG: "./other.swift": [


// RUN: rm -rf %t && cp -r %S/Inputs/fail-simple/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/fail-simple/* %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 -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
Expand Down
6 changes: 4 additions & 2 deletions test/Driver/Dependencies/fail-chained.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// a ==> bad ==> c ==> d | b --> bad --> e ==> f

// RUN: rm -rf %t && cp -r %S/Inputs/fail-chained/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/fail-chained/* %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 ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down Expand Up @@ -60,7 +61,8 @@
// NEGATIVE-A2-NOT: Handled f.swift


// RUN: rm -rf %t && cp -r %S/Inputs/fail-chained/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/fail-chained/* %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 ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/fail-interface-hash.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// main ==> depends-on-main | bad ==> depends-on-bad

// RUN: rm -rf %t && cp -r %S/Inputs/fail-interface-hash/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/fail-interface-hash/* %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 ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/fail-new.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// bad ==> main | bad --> other

// RUN: rm -rf %t && cp -r %S/Inputs/fail-simple/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/fail-simple/* %t
// RUN: touch -t 201401240005 %t/*

// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/fail-simple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// bad ==> main | bad --> other

// RUN: rm -rf %t && cp -r %S/Inputs/fail-simple/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/fail-simple/* %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 ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/fail-with-bad-deps.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// main ==> depends-on-main | bad ==> depends-on-bad

// RUN: rm -rf %t && cp -r %S/Inputs/fail-with-bad-deps/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/fail-with-bad-deps/* %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 ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/file-added.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// other ==> main

// RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/one-way/* %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 ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down
3 changes: 2 additions & 1 deletion test/Driver/Dependencies/independent-half-dirty.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/independent/* %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 -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down
6 changes: 4 additions & 2 deletions test/Driver/Dependencies/independent-parseable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/independent/* %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 -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand Down Expand Up @@ -28,7 +29,8 @@
// 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 -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s


// RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/independent/* %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 -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
Expand Down
9 changes: 6 additions & 3 deletions test/Driver/Dependencies/independent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// main | other

// RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/independent/* %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 -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
Expand All @@ -20,7 +21,8 @@
// 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 -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s


// RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/independent/* %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 -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
Expand All @@ -34,7 +36,8 @@
// 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 -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s


// RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/independent/* %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 -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SINGLE %s
Expand Down
6 changes: 4 additions & 2 deletions test/Driver/Dependencies/malformed-but-valid-yaml.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// RUN: rm -rf %t && cp -r %S/Inputs/malformed-but-valid-yaml/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/malformed-but-valid-yaml/* %t
// RUN: touch -t 201401240005 %t/*.swift

// Generate the build record...
Expand All @@ -24,7 +25,8 @@
// CHECK-THIRD: Handled main.swift
// CHECK-THIRD: Handled other.swift

// RUN: rm -rf %t && cp -r %S/Inputs/malformed-but-valid-yaml/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/malformed-but-valid-yaml/* %t
// RUN: touch -t 201401240005 %t/*.swift

// Generate the build record...
Expand Down
6 changes: 4 additions & 2 deletions test/Driver/Dependencies/malformed.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// RUN: rm -rf %t && cp -r %S/Inputs/malformed-after/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/malformed-after/* %t
// RUN: touch -t 201401240005 %t/*.swift

// Generate the build record...
Expand All @@ -24,7 +25,8 @@
// CHECK-THIRD: Handled main.swift
// CHECK-THIRD: Handled other.swift

// RUN: rm -rf %t && cp -r %S/Inputs/malformed-after/ %t
// RUN: %empty-directory(%t)
// RUN: cp -r %S/Inputs/malformed-after/* %t
// RUN: touch -t 201401240005 %t/*.swift

// Generate the build record...
Expand Down
Loading