Skip to content

Commit 7bfa061

Browse files
bnbarhambnbarham
authored
Merge pull request #64127 from bnbarham/rename-new-substitution
[Test] Rename substitution so it isn't incorrectly substituted
2 parents 302180f + 2b43cf2 commit 7bfa061

10 files changed

+25
-37
lines changed

‎test/Driver/batch_mode_dependencies_make_wrong_order.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
// RUN: echo 'class c : b {}' >%t/c.swift
55
// RUN: echo 'class d : c {}' >%t/d.swift
66
// RUN: echo 'public func main() {}' >%t/main.swift
7-
// REQUIRES: rdar106170241
87

98
// First prime the incremental state, but note that we're building in the d c b a (reverse-alphabetical) order.
10-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -incremental -output-file-map %S/Inputs/abcd_filemap.yaml -module-name main -j 1 d.swift c.swift b.swift a.swift main.swift
9+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -incremental -output-file-map %S/Inputs/abcd_filemap.yaml -module-name main -j 1 d.swift c.swift b.swift a.swift main.swift
1110
//
1211
// Now perturb the interface of a.swift and delete its output
1312
// RUN: echo 'class a { var x : Int = 10 }' >%t/a.swift
1413
// RUN: rm %t/a.o
1514
//
1615
// Now rebuild, which will rebuild a.swift then do a cascading dep-graph invalidation
17-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -incremental -output-file-map %S/Inputs/abcd_filemap.yaml -module-name main -j 1 d.swift c.swift b.swift a.swift main.swift -driver-show-incremental -driver-show-job-lifecycle >%t/out.txt 2>&1
16+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -incremental -output-file-map %S/Inputs/abcd_filemap.yaml -module-name main -j 1 d.swift c.swift b.swift a.swift main.swift -driver-show-incremental -driver-show-job-lifecycle >%t/out.txt 2>&1
1817
// RUN: %FileCheck %s <%t/out.txt
1918
//
2019
// Check that we saw invalidation happen in command-line argument order

‎test/Incremental/Fingerprints/class-fingerprint.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Seeing weird failure on CI, so set the mod times
1111
// RUN: touch -t 200101010101 %t/*.swift
1212

13-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
13+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
1414

1515
// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
1616

@@ -24,13 +24,11 @@
2424
// RUN: touch -t 200101010101 %t/*.swift
2525
// RUN: touch -t 200301010101 %t/definesAB.swift
2626

27-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
27+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
2828

2929
// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
3030

3131
// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output4
3232

33-
// REQUIRES: rdar106170343
34-
3533
// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
3634
// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}

‎test/Incremental/Fingerprints/enum-fingerprint.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Seeing weird failure on CI, so set the mod times
1111
// RUN: touch -t 200101010101 %t/*.swift
1212

13-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
13+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
1414

1515
// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
1616

@@ -24,12 +24,11 @@
2424
// RUN: touch -t 200101010101 %t/*.swift
2525
// RUN: touch -t 200301010101 %t/definesAB.swift
2626

27-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
27+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
2828

2929
// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
3030

3131
// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output4
3232

33-
// REQUIRES: rdar106170343
3433
// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
3534
// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}

‎test/Incremental/Fingerprints/extension-adds-member.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Seeing weird failure on CI, so set the mod times
1111
// RUN: touch -t 200101010101 %t/*.swift
1212

13-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >& %t/output3
13+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >& %t/output3
1414

1515
// Change one type, only uses of that type get recompiled
1616

@@ -21,13 +21,11 @@
2121
// RUN: touch -t 200101010101 %t/*.swift
2222
// RUN: touch -t 200301010101 %t/definesAB.swift
2323

24-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >& %t/output4
24+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >& %t/output4
2525

2626
// RUN: %FileCheck -check-prefix=CHECK-RECOMPILED-W %s < %t/output4
2727
// RUN: %FileCheck -check-prefix=CHECK-NOT-RECOMPILED-W %s < %t/output4
2828

29-
// REQUIRES: rdar106170343
30-
3129
// CHECK-RECOMPILED-W: {compile: definesAB.o <= definesAB.swift}
3230
// CHECK-RECOMPILED-W: {compile: usesA.o <= usesA.swift}
3331

‎test/Incremental/Fingerprints/nested-enum-fingerprint.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Seeing weird failure on CI, so set the mod times
1111
// RUN: touch -t 200101010101 %t/*.swift
1212

13-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
13+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
1414

1515
// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
1616

@@ -24,7 +24,7 @@
2424
// RUN: touch -t 200101010101 %t/*.swift
2525
// RUN: touch -t 200301010101 %t/definesAB.swift
2626

27-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
27+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
2828

2929
// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
3030

‎test/Incremental/Fingerprints/protocol-fingerprint.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Seeing weird failure on CI, so set the mod times
1111
// RUN: touch -t 200101010101 %t/*.swift
1212

13-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
13+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
1414

1515
// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
1616

@@ -24,13 +24,11 @@
2424
// RUN: touch -t 200101010101 %t/*.swift
2525
// RUN: touch -t 200301010101 %t/definesAB.swift
2626

27-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
27+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
2828

2929
// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
3030

3131
// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output4
3232

33-
// REQUIRES: rdar106170343
34-
3533
// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
3634
// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}

‎test/Incremental/Fingerprints/struct-fingerprint.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Seeing weird failure on CI, so set the mod times
1111
// RUN: touch -t 200101010101 %t/*.swift
1212

13-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
13+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
1414

1515
// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
1616

@@ -24,7 +24,7 @@
2424
// RUN: touch -t 200101010101 %t/*.swift
2525
// RUN: touch -t 200301010101 %t/definesAB.swift
2626

27-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
27+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
2828

2929
// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
3030

‎test/Incremental/cross-file-failure.swift

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// RUN: touch -t 200101010101 %t/*.swift
77
// RUN: cd %t
88

9-
// RUN: %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesA.swift usesA.swift -module-name main -output-file-map ofm.json >&output-baseline
9+
// RUN: %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesA.swift usesA.swift -module-name main -output-file-map ofm.json >&output-baseline
1010

1111
// Change one type and cause a syntax error. This should cause _both_ files to
1212
// rebuild.
@@ -16,16 +16,14 @@
1616
// RUN: touch -t 200101010101 %t/*.swift
1717
// RUN: touch -t 200301010101 %t/definesA.swift
1818

19-
// RUN: not %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesA.swift usesA.swift -module-name main -output-file-map ofm.json
19+
// RUN: not %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesA.swift usesA.swift -module-name main -output-file-map ofm.json
2020

2121
// RUN: cp %t/definesA{-three,}.swift
2222
// RUN: touch -t 200401010101 %t/definesA.swift
2323

24-
// RUN: not %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesA.swift usesA.swift -module-name main -output-file-map ofm.json >&output-incremental
24+
// RUN: not %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesA.swift usesA.swift -module-name main -output-file-map ofm.json >&output-incremental
2525

2626
// RUN: %FileCheck -check-prefix=CHECK-RECOMPILED %s --dump-input=always < %t/output-incremental
2727

28-
// REQUIRES: rdar106170343
29-
3028
// CHECK-RECOMPILED: Queuing (initial): {compile: definesA.o <= definesA.swift}
3129
// CHECK-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}

‎test/Incremental/superfluous-cascade.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// RUN: cp %t/definesPoint{-before,}.swift
66
// RUN: touch -t 200101010101 %t/*.swift
77

8-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift -module-name main -output-file-map ofm.json >&output3
8+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift -module-name main -output-file-map ofm.json >&output3
99

1010
// Change one type - now only the user of that type rebuilds
1111

@@ -14,11 +14,9 @@
1414
// RUN: touch -t 200101010101 %t/*.swift
1515
// RUN: touch -t 200301010101 %t/definesPoint.swift
1616

17-
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift -module-name main -output-file-map ofm.json >&output4
17+
// RUN: cd %t && %target-stdlib-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift -module-name main -output-file-map ofm.json >&output4
1818

1919
// RUN: %FileCheck -check-prefix=CHECK-RECOMPILED %s --dump-input=always < %t/output4
2020

21-
// REQUIRES: rdar106170343
22-
2321
// CHECK-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesPoint.o <= usesPoint.swift}
2422
// CHECK-RECOMPILED-NOT: Queuing because of dependencies discovered later: {compile: usesDisplay.o <= usesDisplay.swift}

‎test/lit.cfg

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,7 +1329,7 @@ if run_vendor == 'apple':
13291329
"-Xlinker -headerpad_max_install_names " +
13301330
"-Xlinker -rpath -Xlinker /usr/lib/swift %s ")%
13311331
(xcrun_prefix, config.swiftc, target_options, config.swift_driver_test_options))
1332-
config.swiftc_driver_stdlib_target = config.target_swiftc_driver
1332+
config.target_stdlib_swiftc_driver = config.target_swiftc_driver
13331333
config.target_clang = (
13341334
"%s %s %s" %
13351335
(xcrun_prefix, config.clangxx, config.target_cc_options))
@@ -1468,7 +1468,7 @@ elif run_os in ['windows-msvc']:
14681468
config.resource_dir_opt, mcp_opt, \
14691469
config.swift_system_overlay_opt, \
14701470
config.swift_driver_test_options))
1471-
config.swiftc_driver_stdlib_target = \
1471+
config.target_stdlib_swiftc_driver = \
14721472
('%r -target %s %s %s %s' % (config.swiftc, config.variant_triple, \
14731473
config.resource_dir_opt, mcp_opt, \
14741474
config.swift_driver_test_options))
@@ -1599,7 +1599,7 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
15991599
config.target_swiftc_driver = (
16001600
"%s -target %s -toolchain-stdlib-rpath %s %s %s" %
16011601
(config.swiftc, config.variant_triple, config.resource_dir_opt, mcp_opt, config.swift_driver_test_options))
1602-
config.swiftc_driver_stdlib_target = config.target_swiftc_driver
1602+
config.target_stdlib_swiftc_driver = config.target_swiftc_driver
16031603
config.target_swift_modulewrap = (
16041604
'%s -modulewrap -target %s' %
16051605
(config.swiftc, config.variant_triple))
@@ -1718,7 +1718,7 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
17181718
'-tools-directory', tools_directory,
17191719
config.resource_dir_opt, mcp_opt,
17201720
config.swift_driver_test_options])
1721-
config.swiftc_driver_stdlib_target = config.target_swiftc_driver
1721+
config.target_stdlib_swiftc_driver = config.target_swiftc_driver
17221722
config.target_swift_modulewrap = ' '.join([
17231723
config.swiftc, '-modulewrap',
17241724
'-target', config.variant_triple])
@@ -1786,7 +1786,7 @@ elif run_os == 'wasi':
17861786
config.target_swiftc_driver = (
17871787
"%s -target %s -toolchain-stdlib-rpath %s %s" %
17881788
(config.swiftc, config.variant_triple, config.resource_dir_opt, mcp_opt))
1789-
config.swiftc_driver_stdlib_target = config.target_swiftc_driver
1789+
config.target_stdlib_swiftc_driver = config.target_swiftc_driver
17901790
config.target_swift_modulewrap = (
17911791
'%s -modulewrap -target %s' %
17921792
(config.swiftc, config.variant_triple))
@@ -2504,7 +2504,7 @@ config.substitutions.append(('%target-swift-reflection-test', config.target_swif
25042504

25052505
config.substitutions.append(('%target-swift-reflection-dump', '{} {} {}'.format(config.swift_reflection_dump, '-arch', run_cpu)))
25062506
config.substitutions.append(('%target-swiftc_driver', config.target_swiftc_driver))
2507-
config.substitutions.append(('%swiftc_driver-stdlib-target', config.swiftc_driver_stdlib_target))
2507+
config.substitutions.append(('%target-stdlib-swiftc_driver', config.target_stdlib_swiftc_driver))
25082508

25092509
config.substitutions.append(('%target-swift-remoteast-test-with-sdk',
25102510
'%s %s -sdk %r' %

0 commit comments

Comments
 (0)