Skip to content

Commit 2566ed4

Browse files
[TEST-ONLY] Speed up bridging-header-autochaining test
Avoid building swift stdlib interface to speed up a slow test.
1 parent a8c36dc commit 2566ed4

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

test/ScanDependencies/bridging-header-autochaining.swift

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// RUN: %empty-directory(%t)
33
// RUN: split-file %s %t
44

5-
// RUN: %target-swift-frontend -scan-dependencies -module-name Test -module-cache-path %t/clang-module-cache -O \
6-
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import \
5+
// RUN: %target-swift-frontend -scan-dependencies -module-name Test -module-cache-path %t/clang-module-cache -O -module-load-mode prefer-serialized \
6+
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -scanner-module-validation \
77
// RUN: %t/test.swift -o %t/deps.json -auto-bridging-header-chaining -scanner-output-dir %t -scanner-debug-write-output \
88
// RUN: -Xcc -fmodule-map-file=%t/a.modulemap -Xcc -fmodule-map-file=%t/b.modulemap -import-objc-header %t/Bridging.h
99

@@ -17,8 +17,6 @@
1717

1818
// RUN: %{python} %S/../CAS/Inputs/BuildCommandExtractor.py %t/deps.json clang:SwiftShims > %t/shim.cmd
1919
// RUN: %swift_frontend_plain @%t/shim.cmd
20-
// RUN: %{python} %S/../CAS/Inputs/BuildCommandExtractor.py %t/deps.json Swift > %t/swift.cmd
21-
// RUN: %swift_frontend_plain @%t/swift.cmd
2220
// RUN: %{python} %S/../CAS/Inputs/BuildCommandExtractor.py %t/deps.json clang:B > %t/B.cmd
2321
// RUN: %swift_frontend_plain @%t/B.cmd
2422
// RUN: %{python} %S/../CAS/Inputs/BuildCommandExtractor.py %t/deps.json clang:A > %t/A.cmd
@@ -51,8 +49,8 @@
5149
// RUN: -I %t %t/user2.swift -import-objc-header %t/Bridging2.h
5250

5351
/// Importing binary module with bridging header from a module that has no bridging header.
54-
// RUN: %target-swift-frontend -scan-dependencies -module-name User -module-cache-path %t/clang-module-cache -O \
55-
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import \
52+
// RUN: %target-swift-frontend -scan-dependencies -module-name User -module-cache-path %t/clang-module-cache -O -module-load-mode prefer-serialized \
53+
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -scanner-module-validation \
5654
// RUN: %t/user.swift -o %t/deps2.json -auto-bridging-header-chaining -scanner-output-dir %t -scanner-debug-write-output \
5755
// RUN: -Xcc -fmodule-map-file=%t/a.modulemap -Xcc -fmodule-map-file=%t/b.modulemap -I %t -enable-library-evolution
5856

@@ -83,8 +81,8 @@
8381
// NO-OBJC-LEAKING-NOT: import __ObjC
8482

8583
/// Importing binary module with bridging header from a module with bridging header using explicit build method with header chaining.
86-
// RUN: %target-swift-frontend -scan-dependencies -module-name User -O \
87-
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import \
84+
// RUN: %target-swift-frontend -scan-dependencies -module-name User -O -module-load-mode prefer-serialized \
85+
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -scanner-module-validation \
8886
// RUN: -Xcc -fmodule-map-file=%t/a.modulemap -Xcc -fmodule-map-file=%t/b.modulemap \
8987
// RUN: -I %t %t/user2.swift -import-objc-header %t/Bridging2.h -auto-bridging-header-chaining -scanner-output-dir %t -scanner-debug-write-output \
9088
// RUN: -o %t/deps3.json
@@ -102,8 +100,6 @@
102100

103101
// RUN: %{python} %S/../CAS/Inputs/BuildCommandExtractor.py %t/deps3.json clang:SwiftShims > %t/shim2.cmd
104102
// RUN: %swift_frontend_plain @%t/shim2.cmd
105-
// RUN: %{python} %S/../CAS/Inputs/BuildCommandExtractor.py %t/deps3.json Swift > %t/swift2.cmd
106-
// RUN: %swift_frontend_plain @%t/swift2.cmd
107103
// RUN: %{python} %S/../CAS/Inputs/BuildCommandExtractor.py %t/deps3.json clang:B > %t/B2.cmd
108104
// RUN: %swift_frontend_plain @%t/B2.cmd
109105
// RUN: %{python} %S/../CAS/Inputs/BuildCommandExtractor.py %t/deps3.json clang:A > %t/A2.cmd
@@ -131,15 +127,15 @@
131127
// OBJC-HEADER-SAME: Bridging2.h
132128
// OBJC-HEADER-NOT: ChainedBridgingHeader.h
133129

134-
// RUN: %target-swift-frontend -scan-dependencies -module-name User -O \
135-
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import \
130+
// RUN: %target-swift-frontend -scan-dependencies -module-name User -O -module-load-mode prefer-serialized \
131+
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -scanner-module-validation \
136132
// RUN: -Xcc -fmodule-map-file=%t/a.modulemap -Xcc -fmodule-map-file=%t/b.modulemap \
137133
// RUN: -I %t %t/user2.swift -import-objc-header %t/Bridging3.h -auto-bridging-header-chaining -scanner-output-dir %t -scanner-debug-write-output \
138134
// RUN: -o %t/deps4.json -Rdependency-scan-cache -serialize-dependency-scan-cache -dependency-scan-cache-path %t/cache.moddepcache
139135

140136
/// Make sure the cache is correct.
141-
// RUN: %target-swift-frontend -scan-dependencies -module-name User -O \
142-
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import \
137+
// RUN: %target-swift-frontend -scan-dependencies -module-name User -O -module-load-mode prefer-serialized \
138+
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -scanner-module-validation \
143139
// RUN: -Xcc -fmodule-map-file=%t/a.modulemap -Xcc -fmodule-map-file=%t/b.modulemap \
144140
// RUN: -I %t %t/user2.swift -import-objc-header %t/Bridging3.h -auto-bridging-header-chaining -scanner-output-dir %t -scanner-debug-write-output \
145141
// RUN: -o %t/deps4.json -Rdependency-scan-cache -load-dependency-scan-cache -serialize-dependency-scan-cache \

0 commit comments

Comments
 (0)