Skip to content

Commit 489001d

Browse files
authored
Merge pull request swiftlang#21051 from compnerd/interpret
2 parents 3f61389 + bfaa42f commit 489001d

7 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030

3131
// FILE-ADDED: inputs: ["./added.swift"], output: {{[{].*[}]}}, condition: newly-added{{$}}
3232

33-
// RUN: %S/Inputs/touch.py 443865960 %t/main.swift
33+
// RUN: %{python} %S/Inputs/touch.py 443865960 %t/main.swift
3434
// 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=BUILD-RECORD-PLUS-CHANGE
3535
// BUILD-RECORD-PLUS-CHANGE: inputs: ["./main.swift"], output: {{[{].*[}]}}, condition: run-without-cascading
3636
// BUILD-RECORD-PLUS-CHANGE: inputs: ["./other.swift"], output: {{[{].*[}]}}, condition: run-without-cascading{{$}}
3737
// BUILD-RECORD-PLUS-CHANGE: inputs: ["./yet-another.swift"], output: {{[{].*[}]$}}
3838

39-
// RUN: %S/Inputs/touch.py 443865900 %t/*
39+
// RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
4040
// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=FILE-REMOVED
4141
// FILE-REMOVED: inputs: ["./main.swift"], output: {{[{].*[}]$}}
4242
// FILE-REMOVED: inputs: ["./other.swift"], output: {{[{].*[}]$}}

test/Driver/Dependencies/dependencies-preservation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// RUN: %empty-directory(%t)
55
// RUN: cp -r %S/Inputs/one-way/* %t
6-
// RUN: %S/Inputs/touch.py 443865900 %t/*
6+
// RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
77
// RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
88
// 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
99

test/Driver/Dependencies/driver-show-incremental-arguments.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

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

1616
// 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 | %FileCheck --check-prefix CHECK-INCREMENTAL %s

test/Driver/Dependencies/driver-show-incremental-conflicting-arguments.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

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

1616
// 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 | %FileCheck --check-prefix CHECK-INCREMENTAL %s

test/Driver/Dependencies/driver-show-incremental-inputs.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

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

1616
// 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 | %FileCheck --check-prefix CHECK-INCREMENTAL %s

test/Driver/Dependencies/driver-show-incremental-malformed.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
// RUN: %empty-directory(%t)
1111
// RUN: cp -r %S/Inputs/one-way/* %t
12-
// RUN: %S/Inputs/touch.py 443865900 %t/*
12+
// RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
1313

1414
// RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
1515
// 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 | %FileCheck --check-prefix CHECK-INCREMENTAL %s

test/Driver/Dependencies/driver-show-incremental-swift-version.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// RUN: %empty-directory(%t)
1212
// RUN: cp -r %S/Inputs/one-way/* %t
13-
// RUN: %S/Inputs/touch.py 443865900 %t/*
13+
// RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
1414

1515
// RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
1616
// 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 | %FileCheck --check-prefix CHECK-INCREMENTAL %s

0 commit comments

Comments
 (0)