Skip to content

Commit 08b470d

Browse files
naveen-sethnaveen-seth
committed
Omit 'named-module-deps: […]' when empty to avoid updating all tests
1 parent 981742e commit 08b470d

26 files changed

+59
-57
lines changed

‎clang/test/ClangScanDeps/diagnostics.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module mod { header "mod.h" }
4444
// CHECK-NEXT: "translation-units": [
4545
// CHECK-NEXT: {
4646
// CHECK: "clang-context-hash": "[[HASH_TU:.*]],
47-
// CHECK: "clang-module-deps": [
47+
// CHECK-NEXT: "clang-module-deps": [
4848
// CHECK-NEXT: {
4949
// CHECK-NEXT: "context-hash": "[[HASH_MOD]]",
5050
// CHECK-NEXT: "module-name": "mod"

‎clang/test/ClangScanDeps/header-search-pruning-transitive.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ module X { header "X.h" }
9898
// CHECK-NEXT: "translation-units": [
9999
// CHECK-NEXT: {
100100
// CHECK: "clang-context-hash": "{{.*}}",
101-
// CHECK: "clang-module-deps": [
101+
// CHECK-NEXT: "clang-module-deps": [
102102
// CHECK-NEXT: {
103103
// CHECK-NEXT: "context-hash": "[[HASH_X]]",
104104
// CHECK-NEXT: "module-name": "X"
@@ -153,7 +153,7 @@ module X { header "X.h" }
153153
// CHECK-NEXT: "translation-units": [
154154
// CHECK-NEXT: {
155155
// CHECK: "clang-context-hash": "{{.*}}",
156-
// CHECK: "clang-module-deps": [
156+
// CHECK-NEXT: "clang-module-deps": [
157157
// CHECK-NEXT: {
158158
// CHECK-NEXT: "context-hash": "{{.*}}",
159159
// CHECK-NEXT: "module-name": "X"

‎clang/test/ClangScanDeps/modules-context-hash-cwd.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ module mod {
7575
// CHECK: {
7676
// CHECK-NEXT: "modules": [
7777
// CHECK-NEXT: {
78-
// CHECK: "clang-module-deps": [],
78+
// CHECK-NEXT: "clang-module-deps": [],
7979
// CHECK: "context-hash": "[[HASH:.*]]",
8080
// CHECK: }
8181
// CHECK: "translation-units": [
8282
// CHECK: {
8383
// CHECK: "commands": [
8484
// CHECK: {
8585
// CHECK-NEXT: "clang-context-hash": "{{.*}}",
86-
// CHECK: "clang-module-deps": [
86+
// CHECK-NEXT: "clang-module-deps": [
8787
// CHECK-NEXT: {
8888
// CHECK-NEXT: "context-hash": "[[HASH]]",
8989
// CHECK-NEXT: "module-name": "mod"
@@ -100,7 +100,7 @@ module mod {
100100
// CHECK: "commands": [
101101
// CHECK: {
102102
// CHECK-NEXT: "clang-context-hash": "{{.*}}",
103-
// CHECK: "clang-module-deps": [
103+
// CHECK-NEXT: "clang-module-deps": [
104104
// CHECK-NEXT: {
105105
// CHECK-NEXT: "context-hash": "[[HASH]]",
106106
// CHECK-NEXT: "module-name": "mod"
@@ -112,15 +112,15 @@ module mod {
112112
// SKIPOPT: {
113113
// SKIPOPT-NEXT: "modules": [
114114
// SKIPOPT-NEXT: {
115-
// SKIPOPT: "clang-module-deps": [],
115+
// SKIPOPT-NEXT: "clang-module-deps": [],
116116
// SKIPOPT: "context-hash": "[[HASH0:.*]]",
117117
// SKIPOPT: }
118118
// SKIPOPT: "translation-units": [
119119
// SKIPOPT: {
120120
// SKIPOPT: "commands": [
121121
// SKIPOPT: {
122122
// SKIPOPT-NEXT: "clang-context-hash": "{{.*}}",
123-
// SKIPOPT: "clang-module-deps": [
123+
// SKIPOPT-NEXT: "clang-module-deps": [
124124
// SKIPOPT-NEXT: {
125125
// SKIPOPT-NEXT: "context-hash": "[[HASH0]]",
126126
// SKIPOPT-NEXT: "module-name": "mod"
@@ -129,7 +129,7 @@ module mod {
129129
// SKIPOPT: {
130130
// SKIPOPT-NEXT: "modules": [
131131
// SKIPOPT-NEXT: {
132-
// SKIPOPT: "clang-module-deps": [],
132+
// SKIPOPT-NEXT: "clang-module-deps": [],
133133
// SKIPOPT-NOT: "context-hash": "[[HASH0]]",
134134
// SKIPOPT: "context-hash": "[[HASH2:.*]]",
135135
// SKIPOPT: }
@@ -138,7 +138,7 @@ module mod {
138138
// SKIPOPT: "commands": [
139139
// SKIPOPT: {
140140
// SKIPOPT-NEXT: "clang-context-hash": "{{.*}}",
141-
// SKIPOPT: "clang-module-deps": [
141+
// SKIPOPT-NEXT: "clang-module-deps": [
142142
// SKIPOPT-NEXT: {
143143
// SKIPOPT-NOT: "context-hash": "[[HASH0]]",
144144
// SKIPOPT-NEXT: "context-hash": "[[HASH2]]"
@@ -160,7 +160,7 @@ module mod {
160160
// RELPATH: "commands": [
161161
// RELPATH: {
162162
// RELPATH-NEXT: "clang-context-hash": "{{.*}}",
163-
// RELPATH: "clang-module-deps": [
163+
// RELPATH-NEXT: "clang-module-deps": [
164164
// RELPATH-NEXT: {
165165
// RELPATH-NEXT: "context-hash": "[[HASH3]]",
166166
// RELPATH-NEXT: "module-name": "mod"
@@ -178,7 +178,7 @@ module mod {
178178
// RELPATH: "commands": [
179179
// RELPATH: {
180180
// RELPATH-NEXT: "clang-context-hash": "{{.*}}",
181-
// RELPATH: "clang-module-deps": [
181+
// RELPATH-NEXT: "clang-module-deps": [
182182
// RELPATH-NEXT: {
183183
// RELPATH-NOT: "context-hash": "[[HASH3]]",
184184
// RELPATH-NEXT: "context-hash": "[[HASH4]]"

‎clang/test/ClangScanDeps/modules-context-hash.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
// CHECK-NEXT: "translation-units": [
4646
// CHECK-NEXT: {
4747
// CHECK: "clang-context-hash": "{{.*}}",
48-
// CHECK: "clang-module-deps": [
48+
// CHECK-NEXT: "clang-module-deps": [
4949
// CHECK-NEXT: {
5050
// CHECK-NEXT: "context-hash": "[[HASH_MOD_A]]",
5151
// CHECK-NEXT: "module-name": "mod"
@@ -83,7 +83,7 @@
8383
// CHECK-NEXT: "translation-units": [
8484
// CHECK-NEXT: {
8585
// CHECK: "clang-context-hash": "{{.*}}",
86-
// CHECK: "clang-module-deps": [
86+
// CHECK-NEXT: "clang-module-deps": [
8787
// CHECK-NEXT: {
8888
// CHECK-NOT: "context-hash": "[[HASH_MOD_A]]",
8989
// CHECK: "module-name": "mod"

‎clang/test/ClangScanDeps/modules-dep-args.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ module Direct { header "direct.h" }
8181
// CHECK-NEXT: "translation-units": [
8282
// CHECK-NEXT: {
8383
// CHECK: "clang-context-hash": "{{.*}}",
84-
// CHECK: "clang-module-deps": [
84+
// CHECK-NEXT: "clang-module-deps": [
8585
// CHECK-NEXT: {
8686
// CHECK-NEXT: "context-hash": "{{.*}}",
8787
// CHECK-NEXT: "module-name": "Direct"

‎clang/test/ClangScanDeps/modules-extern-submodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ module third {}
101101
// CHECK-NEXT: "commands": [
102102
// CHECK-NEXT: {
103103
// CHECK-NEXT: "clang-context-hash": "{{.*}}",
104-
// CHECK: "clang-module-deps": [
104+
// CHECK-NEXT: "clang-module-deps": [
105105
// CHECK-NEXT: {
106106
// CHECK-NEXT: "context-hash": "{{.*}}",
107107
// CHECK-NEXT: "module-name": "first"

‎clang/test/ClangScanDeps/modules-extern-unrelated.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
// CHECK-NEXT: "commands": [
108108
// CHECK-NEXT: {
109109
// CHECK-NEXT: "clang-context-hash": "{{.*}}",
110-
// CHECK: "clang-module-deps": [
110+
// CHECK-NEXT: "clang-module-deps": [
111111
// CHECK-NEXT: {
112112
// CHECK-NEXT: "context-hash": "{{.*}}",
113113
// CHECK-NEXT: "module-name": "zeroth"

‎clang/test/ClangScanDeps/modules-fmodule-name-no-module-built.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
// CHECK-NEXT: "translation-units": [
3636
// CHECK-NEXT: {
3737
// CHECK: "clang-context-hash": "[[HASH_TU:[A-Z0-9]+]]",
38-
// CHECK: "clang-module-deps": [
38+
// CHECK-NEXT: "clang-module-deps": [
3939
// CHECK-NEXT: {
4040
// CHECK-NEXT: "context-hash": "[[HASH_H2]]",
4141
// CHECK-NEXT: "module-name": "header2"

‎clang/test/ClangScanDeps/modules-full-named-modules.cppm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export void World();
187187
// CHECK: "commands": [
188188
// CHECK-NEXT: {
189189
// CHECK: "module-name": "M:interface_part"
190-
// CHECK-NEXT: "named-module-deps": []
190+
// CHECK-NOT: "named-module-deps": []
191191
// CHECK: "command-line": [
192192
// CHECK: "-o",
193193
// CHECK-NEXT: "{{.*}}/interface_part-{{.*}}.pcm",
@@ -196,7 +196,7 @@ export void World();
196196
// CHECK: },
197197
// CHECK-NEXT: {
198198
// CHECK: "module-name": "M:interface_part"
199-
// CHECK-NEXT: "named-module-deps": []
199+
// CHECK-NOT: "named-module-deps": []
200200
// CHECK: "command-line": [
201201
// CHECK: "-o",
202202
// CHECK-NEXT: "[[PREFIX]]/interface_part.o",
@@ -309,7 +309,7 @@ int main() {
309309
// CHECK: "commands": [
310310
// CHECK-NEXT: {
311311
// CHECK: "module-name": "M:interface_part"
312-
// CHECK-NEXT: "named-module-deps": []
312+
// CHECK-NOT: "named-module-deps": []
313313
// CHECK: "command-line": [
314314
// CHECK: "-o",
315315
// CHECK-NEXT: "{{.*}}/interface_part-{{.*}}.pcm",
@@ -318,7 +318,7 @@ int main() {
318318
// CHECK: },
319319
// CHECK-NEXT: {
320320
// CHECK: "module-name": "M:interface_part"
321-
// CHECK-NEXT: "named-module-deps": []
321+
// CHECK-NOT: "named-module-deps": []
322322
// CHECK: "command-line": [
323323
// CHECK: "-o",
324324
// CHECK-NEXT: "[[PREFIX]]/interface_part.o",

‎clang/test/ClangScanDeps/modules-full-output-tu-order.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
// CHECK-NEXT: "commands": [
3131
// CHECK-NEXT: {
3232
// CHECK-NEXT: "clang-context-hash": "{{.*}}",
33-
// CHECK: "clang-module-deps": [],
33+
// CHECK-NEXT: "clang-module-deps": [],
3434
// CHECK-NEXT: "command-line": [
3535
// CHECK: "-D"
3636
// CHECK-NEXT: "ONE"
@@ -46,7 +46,7 @@
4646
// CHECK-NEXT: "commands": [
4747
// CHECK-NEXT: {
4848
// CHECK-NEXT: "clang-context-hash": "{{.*}}",
49-
// CHECK: "clang-module-deps": [],
49+
// CHECK-NEXT: "clang-module-deps": [],
5050
// CHECK-NEXT: "command-line": [
5151
// CHECK: "-D"
5252
// CHECK-NEXT: "TWO"

0 commit comments

Comments
 (0)