Skip to content

Commit 378e3be

Browse files
jansvoboda11jansvoboda11
authored
Merge pull request #9572 from swiftlang/jan_svoboda/tests-file-deps-order
[clang][deps] Adjust tests after upstream PR llvm#114457
2 parents fe50fa0 + fa311ca commit 378e3be

14 files changed

+30
-30
lines changed

‎clang/test/ClangScanDeps/cas-fs-multiple-commands.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@
200200
// CHECK-LIBCLANG-NEXT: cache-key: [[M_CACHE_KEY:llvmcas://[[:xdigit:]]+]]
201201
// CHECK-LIBCLANG-NEXT: module-deps:
202202
// CHECK-LIBCLANG-NEXT: file-deps:
203-
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/module.h
204203
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/module.modulemap
204+
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/module.h
205205
// CHECK-LIBCLANG-NEXT: build-args: -cc1 {{.*}} -fcas-fs [[M_ROOT_ID]]
206206
// CHECK-LIBCLANG-NEXT: dependencies:
207207
// CHECK-LIBCLANG-NEXT: command 0:

‎clang/test/ClangScanDeps/include-tree-multiple-commands.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@
200200
// CHECK-LIBCLANG-NEXT: cache-key: [[M_CACHE_KEY:llvmcas://[[:xdigit:]]+]]
201201
// CHECK-LIBCLANG-NEXT: module-deps:
202202
// CHECK-LIBCLANG-NEXT: file-deps:
203-
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/include/module.h
204203
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/include/module.modulemap
204+
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/include/module.h
205205
// CHECK-LIBCLANG-NEXT: build-args: -cc1 {{.*}} -fcas-include-tree [[M_INCLUDE_TREE]]
206206
// CHECK-LIBCLANG-NEXT: dependencies:
207207
// CHECK-LIBCLANG-NEXT: command 0:

‎clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
// CHECK: "/^sdk/usr/include"
8383
// CHECK: ]
8484
// CHECK: "file-deps": [
85-
// CHECK: "[[PREFIX]]/a.h"
8685
// CHECK: "[[PREFIX]]/module.modulemap"
86+
// CHECK: "[[PREFIX]]/a.h"
8787
// CHECK: ]
8888
// CHECK: "name": "A"
8989
// CHECK: }
@@ -115,9 +115,9 @@
115115
// CHECK: "context-hash": "[[B_CONTEXT_HASH]]"
116116
// CHECK: "file-deps": [
117117
// Note: PREFIX, SDK_PREFIX and toolchain path are unordered
118-
// CHECK-DAG: "{{.*}}/include/stdarg.h"
119-
// CHECK-DAG: "[[PREFIX]]/b.h"
120118
// CHECK-DAG: "[[PREFIX]]/module.modulemap"
119+
// CHECK-DAG: "[[PREFIX]]/b.h"
120+
// CHECK-DAG: "{{.*}}/include/stdarg.h"
121121
// CHECK-DAG: "[[SDK_PREFIX]]/usr/include/stdlib.h"
122122
// CHECK: ]
123123
// CHECK: "name": "B"

‎clang/test/ClangScanDeps/modules-cas-full-by-mod-name.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ module transitive { header "transitive.h" }
5151
// CHECK: ],
5252
// CHECK-NEXT: "context-hash": "{{.*}}",
5353
// CHECK-NEXT: "file-deps": [
54-
// CHECK-NEXT: "[[PREFIX]]/direct.h"
5554
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
55+
// CHECK-NEXT: "[[PREFIX]]/direct.h"
5656
// CHECK-NEXT: ],
5757
// CHECK-NEXT: "link-libraries": [],
5858
// CHECK-NEXT: "name": "direct"

‎clang/test/ClangScanDeps/modules-cas-trees-with-pch.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
// PCH: "-fmodule-file={{(B=)?}}[[B_PCM]]"
7474
// PCH: ]
7575
// PCH: "file-deps": [
76-
// PCH-NEXT: "[[PREFIX]]{{.}}A.h"
7776
// PCH-NEXT: "[[PREFIX]]{{.}}module.modulemap"
77+
// PCH-NEXT: "[[PREFIX]]{{.}}A.h"
7878
// PCH-NEXT: ]
7979
// PCH: "name": "A"
8080
// PCH: }
@@ -93,8 +93,8 @@
9393
// PCH: "-emit-module"
9494
// PCH: ]
9595
// PCH: "file-deps": [
96-
// PCH-NEXT: "[[PREFIX]]{{.}}B.h"
9796
// PCH-NEXT: "[[PREFIX]]{{.}}module.modulemap"
97+
// PCH-NEXT: "[[PREFIX]]{{.}}B.h"
9898
// PCH-NEXT: ]
9999
// PCH: "name": "B"
100100
// PCH: }
@@ -149,8 +149,8 @@
149149
// CHECK: "[[B_CACHE_KEY:llvmcas://[[:xdigit:]]+]]"
150150
// CHECK: ]
151151
// CHECK: "file-deps": [
152-
// CHECK-NEXT: "[[PREFIX]]{{.}}C.h"
153152
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
153+
// CHECK-NEXT: "[[PREFIX]]{{.}}C.h"
154154
// CHECK-NEXT: ]
155155
// CHECK: "name": "C"
156156
// CHECK: }

‎clang/test/ClangScanDeps/modules-cas-trees.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
// CHECK: "-fmodule-file={{(Top=)?}}[[TOP_PCM]]"
8888
// CHECK: ]
8989
// CHECK: "file-deps": [
90-
// CHECK-NEXT: "[[PREFIX]]{{.}}Left.h"
9190
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
91+
// CHECK-NEXT: "[[PREFIX]]{{.}}Left.h"
9292
// CHECK-NEXT: ]
9393
// CHECK: "name": "Left"
9494
// CHECK: }
@@ -116,8 +116,8 @@
116116
// CHECK: "-fmodule-file={{(Top=)?}}[[TOP_PCM]]"
117117
// CHECK: ]
118118
// CHECK: "file-deps": [
119-
// CHECK-NEXT: "[[PREFIX]]{{.}}Right.h"
120119
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
120+
// CHECK-NEXT: "[[PREFIX]]{{.}}Right.h"
121121
// CHECK: ]
122122
// CHECK: "name": "Right"
123123
// CHECK: }
@@ -137,8 +137,8 @@
137137
// CHECK: "-emit-module"
138138
// CHECK: ]
139139
// CHECK: "file-deps": [
140-
// CHECK-NEXT: "[[PREFIX]]{{.}}Top.h"
141140
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
141+
// CHECK-NEXT: "[[PREFIX]]{{.}}Top.h"
142142
// CHECK: ]
143143
// CHECK: "name": "Top"
144144
// CHECK: }

‎clang/test/ClangScanDeps/modules-include-tree-by-mod-name.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ module transitive { header "transitive.h" }
5151
// CHECK: ],
5252
// CHECK-NEXT: "context-hash": "{{.*}}",
5353
// CHECK-NEXT: "file-deps": [
54-
// CHECK-NEXT: "[[PREFIX]]/direct.h"
5554
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
55+
// CHECK-NEXT: "[[PREFIX]]/direct.h"
5656
// CHECK-NEXT: ],
5757
// CHECK-NEXT: "link-libraries": [],
5858
// CHECK-NEXT: "name": "direct"

‎clang/test/ClangScanDeps/modules-include-tree-prefix-map.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@
140140
// CHECK: "-fno-implicit-modules"
141141
// CHECK: ]
142142
// CHECK: "file-deps": [
143-
// CHECK-NEXT: "[[PREFIX]]/dir1/Left.h"
144143
// CHECK-NEXT: "[[PREFIX]]/dir1/module.modulemap"
144+
// CHECK-NEXT: "[[PREFIX]]/dir1/Left.h"
145145
// CHECK: ]
146146
// CHECK: "name": "Left"
147147
// CHECK: }
@@ -175,8 +175,8 @@
175175
// CHECK: "-fno-implicit-modules"
176176
// CHECK: ]
177177
// CHECK: "file-deps": [
178-
// CHECK-NEXT: "[[PREFIX]]/dir1/Right.h"
179178
// CHECK-NEXT: "[[PREFIX]]/dir1/module.modulemap"
179+
// CHECK-NEXT: "[[PREFIX]]/dir1/Right.h"
180180
// CHECK-NEXT: ]
181181
// CHECK: "name": "Right"
182182
// CHECK: }
@@ -201,9 +201,9 @@
201201
// CHECK: "-fno-implicit-modules"
202202
// CHECK: ]
203203
// CHECK: "file-deps": [
204-
// CHECK-DAG: "{{.*}}/stdbool.h"
205204
// CHECK-DAG: "[[PREFIX]]/dir1/System/module.modulemap"
206205
// CHECK-DAG: "[[PREFIX]]/dir1/System/sys.h"
206+
// CHECK-DAG: "{{.*}}/stdbool.h"
207207
// CHECK: ]
208208
// CHECK: "name": "System"
209209
// CHECK: }
@@ -228,8 +228,8 @@
228228
// CHECK: "-fno-implicit-modules"
229229
// CHECK: ]
230230
// CHECK: "file-deps": [
231-
// CHECK-NEXT: "[[PREFIX]]/dir1/Top.h"
232231
// CHECK-NEXT: "[[PREFIX]]/dir1/module.modulemap"
232+
// CHECK-NEXT: "[[PREFIX]]/dir1/Top.h"
233233
// CHECK-NEXT: ]
234234
// CHECK: "name": "Top"
235235
// CHECK: }

‎clang/test/ClangScanDeps/modules-include-tree-with-pch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
// CHECK: "-fno-implicit-modules"
6565
// CHECK: ]
6666
// CHECK: "file-deps": [
67-
// CHECK-NEXT: "[[PREFIX]]/Right.h"
6867
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
68+
// CHECK-NEXT: "[[PREFIX]]/Right.h"
6969
// CHECK-NEXT: ]
7070
// CHECK: "name": "Right"
7171
// CHECK: }

‎clang/test/ClangScanDeps/modules-include-tree.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@
124124
// CHECK: "-fno-implicit-modules"
125125
// CHECK: ]
126126
// CHECK: "file-deps": [
127-
// CHECK-NEXT: "[[PREFIX]]/Left.h"
128127
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
128+
// CHECK-NEXT: "[[PREFIX]]/Left.h"
129129
// CHECK: ]
130130
// CHECK: "name": "Left"
131131
// CHECK: }
@@ -159,8 +159,8 @@
159159
// CHECK: "-fno-implicit-modules"
160160
// CHECK: ]
161161
// CHECK: "file-deps": [
162-
// CHECK-NEXT: "[[PREFIX]]/Right.h"
163162
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
163+
// CHECK-NEXT: "[[PREFIX]]/Right.h"
164164
// CHECK-NEXT: ]
165165
// CHECK: "name": "Right"
166166
// CHECK: }
@@ -185,8 +185,8 @@
185185
// CHECK: "-fno-implicit-modules"
186186
// CHECK: ]
187187
// CHECK: "file-deps": [
188-
// CHECK-NEXT: "[[PREFIX]]/Top.h"
189188
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
189+
// CHECK-NEXT: "[[PREFIX]]/Top.h"
190190
// CHECK-NEXT: ]
191191
// CHECK: "name": "Top"
192192
// CHECK: }
@@ -211,8 +211,8 @@
211211
// CHECK: "-fno-implicit-modules"
212212
// CHECK: ]
213213
// CHECK: "file-deps": [
214-
// CHECK-NEXT: "[[PREFIX]]/AtImport.h"
215214
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
215+
// CHECK-NEXT: "[[PREFIX]]/AtImport.h"
216216
// CHECK-NEXT: ]
217217
// CHECK: "name": "ZAtImport"
218218
// CHECK: }
@@ -237,8 +237,8 @@
237237
// CHECK: "-fno-implicit-modules"
238238
// CHECK: ]
239239
// CHECK: "file-deps": [
240-
// CHECK-NEXT: "[[PREFIX]]/PragmaImport.h"
241240
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
241+
// CHECK-NEXT: "[[PREFIX]]/PragmaImport.h"
242242
// CHECK-NEXT: ]
243243
// CHECK: "name": "ZPragmaImport"
244244
// CHECK: }

‎clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
// PCH: "/^sdk/usr/include"
113113
// PCH: ]
114114
// PCH: "file-deps": [
115-
// PCH: "[[PREFIX]]/a.h"
116115
// PCH: "[[PREFIX]]/module.modulemap"
116+
// PCH: "[[PREFIX]]/a.h"
117117
// PCH: ]
118118
// PCH: "name": "A"
119119
// PCH: }
@@ -145,10 +145,10 @@
145145
// PCH: "context-hash": "[[B_CONTEXT_HASH]]"
146146
// PCH: "file-deps": [
147147
// Note: PREFIX, SDK_PREFIX and toolchain path are unordered
148-
// PCH-DAG: "{{.*}}/include/stdarg.h"
149-
// PCH-DAG: "[[PREFIX]]/b.h"
150148
// PCH-DAG: "[[PREFIX]]/module.modulemap"
149+
// PCH-DAG: "[[PREFIX]]/b.h"
151150
// PCH-DAG: "[[SDK_PREFIX]]/usr/include/stdlib.h"
151+
// PCH-DAG: "{{.*}}/include/stdarg.h"
152152
// PCH: ]
153153
// PCH: "name": "B"
154154
// PCH: }

‎clang/test/Index/Core/scan-deps-by-mod-name.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
// CHECK-NEXT: module-map-path: [[PREFIX]]/Inputs/module/module.modulemap
1717
// CHECK-NEXT: module-deps:
1818
// CHECK-NEXT: file-deps:
19+
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
1920
// CHECK-NEXT: [[PREFIX]]/Inputs/module/ModA.h
2021
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubModA.h
2122
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubSubModA.h
22-
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
2323
// CHECK-NEXT: build-args: {{.*}} -emit-module {{.*}} -fmodule-name=ModA {{.*}} -fno-implicit-modules {{.*}}
2424
// CHECK-NEXT: dependencies:
2525
// CHECK-NEXT: command 0:

‎clang/test/Index/Core/scan-deps-cas.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
// CHECK-NEXT: cache-key: [[CASFS_MODA_CACHE_KEY:llvmcas://[[:xdigit:]]+]]
3838
// CHECK-NEXT: module-deps:
3939
// CHECK-NEXT: file-deps:
40+
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
4041
// CHECK-NEXT: [[PREFIX]]/Inputs/module/ModA.h
4142
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubModA.h
4243
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubSubModA.h
43-
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
4444
// CHECK-NEXT: build-args:
4545
// CHECK-SAME: -cc1
4646
// CHECK-SAME: -fcas-path
@@ -77,10 +77,10 @@
7777
// INCLUDE_TREE-NEXT: cache-key: [[ModA_CACHE_KEY:llvmcas://[[:xdigit:]]+]]
7878
// INCLUDE_TREE-NEXT: module-deps:
7979
// INCLUDE_TREE-NEXT: file-deps:
80+
// INCLUDE_TREE-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
8081
// INCLUDE_TREE-NEXT: [[PREFIX]]/Inputs/module/ModA.h
8182
// INCLUDE_TREE-NEXT: [[PREFIX]]/Inputs/module/SubModA.h
8283
// INCLUDE_TREE-NEXT: [[PREFIX]]/Inputs/module/SubSubModA.h
83-
// INCLUDE_TREE-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
8484
// INCLUDE_TREE-NEXT: build-args:
8585
// INCLUDE_TREE-SAME: -cc1
8686
// INCLUDE_TREE-SAME: -fcas-path

‎clang/test/Index/Core/scan-deps.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
// CHECK-NEXT: module-map-path: [[PREFIX]]/Inputs/module/module.modulemap
2525
// CHECK-NEXT: module-deps:
2626
// CHECK-NEXT: file-deps:
27+
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
2728
// CHECK-NEXT: [[PREFIX]]/Inputs/module/ModA.h
2829
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubModA.h
2930
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubSubModA.h
30-
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
3131
// CHECK-NEXT: build-args: {{.*}} -emit-module {{.*}} -fmodule-name=ModA {{.*}} -fno-implicit-modules {{.*}}
3232

3333
// CHECK-NEXT: dependencies:

0 commit comments

Comments
 (0)