Skip to content

Commit cfb4a0f

Browse files
CodaFiCodaFi
authored
Merge pull request #34284 from CodaFi/testable-hypotheses
Switch To target-swiftc_driver
2 parents bce6620 + bcd0cb6 commit cfb4a0f

File tree

12 files changed

+36
-54
lines changed

12 files changed

+36
-54
lines changed

‎test/Incremental/CrossModule/Inputs/external-cascade/A.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"object": "./A.o",
44
"swift-dependencies": "./A.swiftdeps",
55
"swiftmodule": "./A~partial.swiftmodule",
6-
"swiftdoc": "./A.swiftdoc",
6+
"swiftdoc": "./A.swiftdoc"
77
},
88
"": {
99
"swift-dependencies": "./A~buildrecord.swiftdeps"

‎test/Incremental/CrossModule/Inputs/external-cascade/B.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"object": "./B.o",
44
"swift-dependencies": "./B.swiftdeps",
55
"swiftmodule": "./B~partial.swiftmodule",
6-
"swiftdoc": "./B.swiftdoc",
6+
"swiftdoc": "./B.swiftdoc"
77
},
88
"": {
99
"swift-dependencies": "./B~buildrecord.swiftdeps"

‎test/Incremental/CrossModule/Inputs/external-cascade/C.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"object": "./C.o",
44
"swift-dependencies": "./C.swiftdeps",
55
"swiftmodule": "./C~partial.swiftmodule",
6-
"swiftdoc": "./C.swiftdoc",
6+
"swiftdoc": "./C.swiftdoc"
77
},
88
"": {
99
"swift-dependencies": "./C~buildrecord.swiftdeps"

‎test/Incremental/CrossModule/Inputs/linear/A.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"object": "./A.o",
44
"swift-dependencies": "./A.swiftdeps",
55
"swiftmodule": "./A~partial.swiftmodule",
6-
"swiftdoc": "./A.swiftdoc",
6+
"swiftdoc": "./A.swiftdoc"
77
},
88
"": {
99
"swift-dependencies": "./A~buildrecord.swiftdeps"

‎test/Incremental/CrossModule/Inputs/linear/B.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"object": "./B.o",
44
"swift-dependencies": "./B.swiftdeps",
55
"swiftmodule": "./B~partial.swiftmodule",
6-
"swiftdoc": "./B.swiftdoc",
6+
"swiftdoc": "./B.swiftdoc"
77
},
88
"": {
99
"swift-dependencies": "./B~buildrecord.swiftdeps"

‎test/Incremental/CrossModule/Inputs/linear/C.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"object": "./C.o",
44
"swift-dependencies": "./C.swiftdeps",
55
"swiftmodule": "./C~partial.swiftmodule",
6-
"swiftdoc": "./C.swiftdoc",
6+
"swiftdoc": "./C.swiftdoc"
77
},
88
"": {
99
"swift-dependencies": "./C~buildrecord.swiftdeps"

‎test/Incremental/CrossModule/Inputs/transitive/A.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"object": "./A.o",
44
"swift-dependencies": "./A.swiftdeps",
55
"swiftmodule": "./A~partial.swiftmodule",
6-
"swiftdoc": "./A.swiftdoc",
6+
"swiftdoc": "./A.swiftdoc"
77
},
88
"": {
99
"swift-dependencies": "./A~buildrecord.swiftdeps"

‎test/Incremental/CrossModule/Inputs/transitive/B.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"object": "./B.o",
44
"swift-dependencies": "./B.swiftdeps",
55
"swiftmodule": "./B~partial.swiftmodule",
6-
"swiftdoc": "./B.swiftdoc",
6+
"swiftdoc": "./B.swiftdoc"
77
},
88
"": {
99
"swift-dependencies": "./B~buildrecord.swiftdeps"

‎test/Incremental/CrossModule/Inputs/transitive/C.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"object": "./C.o",
44
"swift-dependencies": "./C.swiftdeps",
55
"swiftmodule": "./C~partial.swiftmodule",
6-
"swiftdoc": "./C.swiftdoc",
6+
"swiftdoc": "./C.swiftdoc"
77
},
88
"": {
99
"swift-dependencies": "./C~buildrecord.swiftdeps"

‎test/Incremental/CrossModule/external-cascade.swift

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: cp -r %S/Inputs/external-cascade/* %t
33

4-
// rdar://problem/70012853
5-
// XFAIL: OS=windows-msvc
6-
7-
// rdar://70175753
8-
// REQUIRES: rdar70175753
9-
104
//
115
// This test establishes a chain of modules that all depend on a set of
126
// bridging headers. This test ensures that changes to external dependencies -
@@ -22,19 +16,19 @@
2216
// Set up a clean incremental build of all three modules
2317
//
2418

25-
// RUN: cd %t && %swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/C.swiftmodule -enable-experimental-cross-module-incremental-build -module-name C -I %t -output-file-map %t/C.json -working-directory %t -import-objc-header %t/bridging-header.h -Xfrontend -validate-tbd-against-ir=none -driver-show-incremental -driver-show-job-lifecycle %t/C.swift
26-
// RUN: cd %t && %swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/B.swiftmodule -enable-experimental-cross-module-incremental-build -module-name B -I %t -output-file-map %t/B.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle %t/B.swift
27-
// RUN: cd %t && %swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/A.swiftmodule -enable-experimental-cross-module-incremental-build -module-name A -I %t -output-file-map %t/A.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle %t/A.swift
19+
// RUN: cd %t && %target-swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/C.swiftmodule -enable-experimental-cross-module-incremental-build -module-name C -I %t -output-file-map %t/C.json -working-directory %t -import-objc-header %t/bridging-header.h -Xfrontend -validate-tbd-against-ir=none -driver-show-incremental -driver-show-job-lifecycle C.swift
20+
// RUN: cd %t && %target-swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/B.swiftmodule -enable-experimental-cross-module-incremental-build -module-name B -I %t -output-file-map %t/B.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle B.swift
21+
// RUN: cd %t && %target-swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/A.swiftmodule -enable-experimental-cross-module-incremental-build -module-name A -I %t -output-file-map %t/A.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle A.swift
2822

2923
//
3024
// Now change a header and ensure that the rebuild cascades outwards
3125
//
3226

3327
// RUN: rm %t/another-header.h
3428
// RUN: cp %S/Inputs/external-cascade/another-header.h %t/another-header.h
35-
// RUN: cd %t && %swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/C.swiftmodule -enable-experimental-cross-module-incremental-build -module-name C -I %t -output-file-map %t/C.json -working-directory %t -import-objc-header %t/bridging-header.h -Xfrontend -validate-tbd-against-ir=none -driver-show-incremental -driver-show-job-lifecycle %t/C.swift 2>&1 | %FileCheck -check-prefix MODULE-C %s
36-
// RUN: cd %t && %swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/B.swiftmodule -enable-experimental-cross-module-incremental-build -module-name B -I %t -output-file-map %t/B.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle %t/B.swift 2>&1 | %FileCheck -check-prefix MODULE-B %s
37-
// RUN: cd %t && %swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/A.swiftmodule -enable-experimental-cross-module-incremental-build -module-name A -I %t -output-file-map %t/A.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle %t/A.swift 2>&1 | %FileCheck -check-prefix MODULE-A %s
29+
// RUN: cd %t && %target-swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/C.swiftmodule -enable-experimental-cross-module-incremental-build -module-name C -I %t -output-file-map %t/C.json -working-directory %t -import-objc-header %t/bridging-header.h -Xfrontend -validate-tbd-against-ir=none -driver-show-incremental -driver-show-job-lifecycle C.swift 2>&1 | %FileCheck -check-prefix MODULE-C %s
30+
// RUN: cd %t && %target-swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/B.swiftmodule -enable-experimental-cross-module-incremental-build -module-name B -I %t -output-file-map %t/B.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle B.swift 2>&1 | %FileCheck -check-prefix MODULE-B %s
31+
// RUN: cd %t && %target-swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/A.swiftmodule -enable-experimental-cross-module-incremental-build -module-name A -I %t -output-file-map %t/A.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle A.swift 2>&1 | %FileCheck -check-prefix MODULE-A %s
3832

3933
// MODULE-C: Job finished: {generate-pch: bridging-header-[[BRIDGING_HEADER:.*]].pch <= bridging-header.h}
4034
// MODULE-C: Job finished: {compile: C.o <= C.swift bridging-header-[[BRIDGING_HEADER]].pch}
@@ -53,9 +47,9 @@
5347
// And ensure that the null build really is null.
5448
//
5549

56-
// RUN: cd %t && %swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/C.swiftmodule -enable-experimental-cross-module-incremental-build -module-name C -I %t -output-file-map %t/C.json -working-directory %t -import-objc-header %t/bridging-header.h -Xfrontend -validate-tbd-against-ir=none -driver-show-incremental -driver-show-job-lifecycle %t/C.swift 2>&1 | %FileCheck -check-prefix MODULE-C-NULL %s
57-
// RUN: cd %t && %swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/B.swiftmodule -enable-experimental-cross-module-incremental-build -module-name B -I %t -output-file-map %t/B.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle %t/B.swift 2>&1 | %FileCheck -check-prefix MODULE-B-NULL %s
58-
// RUN: cd %t && %swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/A.swiftmodule -enable-experimental-cross-module-incremental-build -module-name A -I %t -output-file-map %t/A.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle %t/A.swift 2>&1 | %FileCheck -check-prefix MODULE-A-NULL %s
50+
// RUN: cd %t && %target-swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/C.swiftmodule -enable-experimental-cross-module-incremental-build -module-name C -I %t -output-file-map %t/C.json -working-directory %t -import-objc-header %t/bridging-header.h -Xfrontend -validate-tbd-against-ir=none -driver-show-incremental -driver-show-job-lifecycle C.swift 2>&1 | %FileCheck -check-prefix MODULE-C-NULL %s
51+
// RUN: cd %t && %target-swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/B.swiftmodule -enable-experimental-cross-module-incremental-build -module-name B -I %t -output-file-map %t/B.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle B.swift 2>&1 | %FileCheck -check-prefix MODULE-B-NULL %s
52+
// RUN: cd %t && %target-swiftc_driver -c -incremental -emit-dependencies -emit-module -emit-module-path %t/A.swiftmodule -enable-experimental-cross-module-incremental-build -module-name A -I %t -output-file-map %t/A.json -working-directory %t -driver-show-incremental -driver-show-job-lifecycle A.swift 2>&1 | %FileCheck -check-prefix MODULE-A-NULL %s
5953

6054
// MODULE-C-NULL: Job finished: {generate-pch: bridging-header-[[BRIDGING_HEADER:.*]].pch <= bridging-header.h}
6155
// MODULE-C-NULL: Job skipped: {compile: C.o <= C.swift bridging-header-[[BRIDGING_HEADER]].pch}

0 commit comments

Comments
 (0)