Skip to content

Commit fc18c64

Browse files
qiongsiwuqiongsiwu
committed
Revising how results are printed out.
1 parent 077c5c2 commit fc18c64

36 files changed

+24
-138
lines changed

‎clang/test/ClangScanDeps/diagnostics.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ module mod { header "mod.h" }
3838
// CHECK-NEXT: "[[PREFIX]]/mod.h"
3939
// CHECK-NEXT: ],
4040
// CHECK-NEXT: "link-libraries": [],
41-
// CHECK-NEXT: "clang-modules-exported": [],
4241
// CHECK-NEXT: "name": "mod"
4342
// CHECK-NEXT: }
4443
// CHECK-NEXT: ],

‎clang/test/ClangScanDeps/export.c‎

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,13 @@ int test1() {
7676
// CHECK-NEXT: "clang-module-deps": [
7777
// CHECK-NEXT: {
7878
// CHECK-NEXT: "context-hash": "[[HASH_MOD_B:.*]]",
79-
// CHECK-NEXT: "module-name": "B"
79+
// CHECK-NEXT: "module-name": "B",
80+
// CHECK-NEXT: "exported": "true"
8081
// CHECK-NEXT: },
8182
// CHECK-NEXT: {
8283
// CHECK-NEXT: "context-hash": "[[HASH_MOD_C:.*]]",
83-
// CHECK-NEXT: "module-name": "C"
84+
// CHECK-NEXT: "module-name": "C",
85+
// CHECK-NEXT: "exported": "true"
8486
// CHECK-NEXT: },
8587
// CHECK-NEXT: {
8688
// CHECK-NEXT: "context-hash": "[[HASH_MOD_D:.*]]",
@@ -90,25 +92,7 @@ int test1() {
9092
// CHECK-NEXT: "clang-modulemap-file":{{.*}},
9193
// CHECK-NEXT: "command-line": [
9294
// CHECK: ],
93-
// CHECK-NEXT: "context-hash":{{.*}}
94-
// CHECK-NEXT: "file-deps": [
95-
// CHECK: ],
96-
// CHECK-NEXT: "link-libraries": [],
97-
// CHECK-NEXT: "clang-modules-exported": [
98-
// CHECK-NEXT: {
99-
// CHECK-NEXT: "context-hash": "[[HASH_MOD_B]]",
100-
// CHECK-NEXT: "module-name": "B"
101-
// CHECK-NEXT: },
102-
// CHECK-NEXT: {
103-
// CHECK-NEXT: "context-hash": "[[HASH_MOD_C]]",
104-
// CHECK-NEXT: "module-name": "C"
105-
// CHECK-NEXT: }
106-
// CHECK-NOT: {
107-
// CHECK-NOT: "context-hash": "[[HASH_MOD_D]]",
108-
// CHECK-NOT: "module-name": "D"
109-
// CHECK-NOT: }
110-
// CHECK-NEXT: ],
111-
// CHECK-NEXT: "name": "A"
95+
// CHECK: "name": "A"
11296
// CHECK-NEXT: }
11397
// CHECK: {
11498
// CHECK: "name": "B"
@@ -123,39 +107,24 @@ int test1() {
123107
// CHECK-NEXT: "clang-module-deps": [
124108
// CHECK-NEXT: {
125109
// CHECK-NEXT: "context-hash": "[[HASH_MOD_B]]",
126-
// CHECK-NEXT: "module-name": "B"
110+
// CHECK-NEXT: "module-name": "B",
111+
// CHECK-NEXT: "exported": "true"
127112
// CHECK-NEXT: },
128113
// CHECK-NEXT: {
129114
// CHECK-NEXT: "context-hash": "[[HASH_MOD_C]]",
130-
// CHECK-NEXT: "module-name": "C"
115+
// CHECK-NEXT: "module-name": "C",
116+
// CHECK-NEXT: "exported": "true"
131117
// CHECK-NEXT: },
132118
// CHECK-NEXT: {
133119
// CHECK-NEXT: "context-hash": "[[HASH_MOD_D]]",
134-
// CHECK-NEXT: "module-name": "D"
120+
// CHECK-NEXT: "module-name": "D",
121+
// CHECK-NEXT: "exported": "true"
135122
// CHECK-NEXT: }
136123
// CHECK-NEXT: ],
137124
// CHECK-NEXT: "clang-modulemap-file":{{.*}},
138125
// CHECK-NEXT: "command-line": [
139126
// CHECK: ],
140-
// CHECK-NEXT: "context-hash":{{.*}}
141-
// CHECK-NEXT: "file-deps": [
142-
// CHECK: ],
143-
// CHECK-NEXT: "link-libraries": [],
144-
// CHECK-NEXT: "clang-modules-exported": [
145-
// CHECK-NEXT: {
146-
// CHECK-NEXT: "context-hash": "[[HASH_MOD_B]]",
147-
// CHECK-NEXT: "module-name": "B"
148-
// CHECK-NEXT: },
149-
// CHECK-NEXT: {
150-
// CHECK-NEXT: "context-hash": "[[HASH_MOD_C]]",
151-
// CHECK-NEXT: "module-name": "C"
152-
// CHECK-NEXT: }
153-
// CHECK-NEXT: {
154-
// CHECK-NEXT: "context-hash": "[[HASH_MOD_D]]",
155-
// CHECK-NEXT: "module-name": "D"
156-
// CHECK-NEXT: }
157-
// CHECK-NEXT: ],
158-
// CHECK-NEXT: "name": "E"
127+
// CHECK: "name": "E"
159128
// CHECK-NEXT: }
160129
// CHECK: ]
161130
// CHECK: }

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ module X { header "X.h" }
7676
// CHECK-NEXT: "[[PREFIX]]/X.h"
7777
// CHECK-NEXT: ],
7878
// CHECK-NEXT: "link-libraries": [],
79-
// CHECK-NEXT: "clang-modules-exported": [],
8079
// CHECK-NEXT: "name": "X"
8180
// CHECK-NEXT: },
8281
// CHECK-NEXT: {
@@ -93,7 +92,6 @@ module X { header "X.h" }
9392
// CHECK-NEXT: "[[PREFIX]]/end/end.h"
9493
// CHECK-NEXT: ],
9594
// CHECK-NEXT: "link-libraries": [],
96-
// CHECK-NEXT: "clang-modules-exported": [],
9795
// CHECK-NEXT: "name": "Y"
9896
// CHECK-NEXT: }
9997
// CHECK-NEXT: ],
@@ -134,7 +132,6 @@ module X { header "X.h" }
134132
// CHECK-NEXT: "[[PREFIX]]/X.h"
135133
// CHECK-NEXT: ],
136134
// CHECK-NEXT: "link-libraries": [],
137-
// CHECK-NEXT: "clang-modules-exported": [],
138135
// CHECK-NEXT: "name": "X"
139136
// CHECK-NEXT: },
140137
// CHECK-NEXT: {
@@ -150,7 +147,6 @@ module X { header "X.h" }
150147
// CHECK-NEXT: "[[PREFIX]]/end/end.h"
151148
// CHECK-NEXT: ],
152149
// CHECK-NEXT: "link-libraries": [],
153-
// CHECK-NEXT: "clang-modules-exported": [],
154150
// CHECK-NEXT: "name": "Y"
155151
// CHECK-NEXT: }
156152
// CHECK-NEXT: ],

‎clang/test/ClangScanDeps/header-search-pruning.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
// CHECK_A-NEXT: "file-deps": [
3535
// CHECK_A: ],
3636
// CHECK_A-NEXT: "link-libraries": [],
37-
// CHECK_A-NEXT: "clang-modules-exported": [],
3837
// CHECK_A-NEXT: "name": "mod"
3938
// CHECK_A-NEXT: }
4039
// CHECK_A-NEXT: ]
@@ -58,7 +57,6 @@
5857
// CHECK_B-NEXT: "file-deps": [
5958
// CHECK_B: ],
6059
// CHECK_B-NEXT: "link-libraries": [],
61-
// CHECK_B-NEXT: "clang-modules-exported": [],
6260
// CHECK_B-NEXT: "name": "mod"
6361
// CHECK_B-NEXT: }
6462
// CHECK_B-NEXT: ]
@@ -84,7 +82,6 @@
8482
// CHECK_AB-NEXT: "file-deps": [
8583
// CHECK_AB: ],
8684
// CHECK_AB-NEXT: "link-libraries": [],
87-
// CHECK_AB-NEXT: "clang-modules-exported": [],
8885
// CHECK_AB-NEXT: "name": "mod"
8986
// CHECK_AB-NEXT: }
9087
// CHECK_AB-NEXT: ]

‎clang/test/ClangScanDeps/link-libraries.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ module transitive {
5353
// CHECK-NEXT: "link-name": "Framework"
5454
// CHECK-NEXT: }
5555
// CHECK-NEXT: ],
56-
// CHECK-NEXT: "clang-modules-exported": [],
5756
// CHECK-NEXT: "name": "Framework"
5857
// CHECK-NEXT: },
5958
// CHECK-NEXT: {
@@ -72,7 +71,6 @@ module transitive {
7271
// CHECK-NEXT: "[[PREFIX]]/direct.h"
7372
// CHECK-NEXT: ],
7473
// CHECK-NEXT: "link-libraries": [],
75-
// CHECK-NEXT: "clang-modules-exported": [],
7674
// CHECK-NEXT: "name": "direct"
7775
// CHECK-NEXT: },
7876
// CHECK-NEXT: {
@@ -97,7 +95,6 @@ module transitive {
9795
// CHECK-NEXT: "[[PREFIX]]/Inputs/frameworks/module.modulemap"
9896
// CHECK-NEXT: ],
9997
// CHECK-NEXT: "link-libraries": [],
100-
// CHECK-NEXT: "clang-modules-exported": [],
10198
// CHECK-NEXT: "name": "root"
10299
// CHECK-NEXT: },
103100
// CHECK-NEXT: {
@@ -116,7 +113,6 @@ module transitive {
116113
// CHECK-NEXT: "link-name": "libTransitive"
117114
// CHECK-NEXT: }
118115
// CHECK-NEXT: ],
119-
// CHECK-NEXT: "clang-modules-exported": [],
120116
// CHECK-NEXT: "name": "transitive"
121117
// CHECK-NEXT: }
122118
// CHECK-NEXT: ],

‎clang/test/ClangScanDeps/modules-canononical-module-map-case.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ framework module FW {
7171
// CHECK-NEXT: "link-name": "FW"
7272
// CHECK-NEXT: }
7373
// CHECK-NEXT: ],
74-
// CHECK-NEXT: "clang-modules-exported": [],
7574
// CHECK-NEXT: "name": "FW"
7675
// CHECK-NEXT: }
7776
// CHECK-NEXT: ]

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
// CHECK-NEXT: "[[PREFIX]]/a/dep.h"
4040
// CHECK-NEXT: ],
4141
// CHECK-NEXT: "link-libraries": [],
42-
// CHECK-NEXT: "clang-modules-exported": [],
4342
// CHECK-NEXT: "name": "mod"
4443
// CHECK-NEXT: }
4544
// CHECK-NEXT: ],
@@ -78,7 +77,6 @@
7877
// CHECK-NEXT: "[[PREFIX]]/b/dep.h"
7978
// CHECK-NEXT: ],
8079
// CHECK-NEXT: "link-libraries": [],
81-
// CHECK-NEXT: "clang-modules-exported": [],
8280
// CHECK-NEXT: "name": "mod"
8381
// CHECK-NEXT: }
8482
// CHECK-NEXT: ],

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ module Direct { header "direct.h" }
6262
// CHECK-NEXT: "[[PREFIX]]/direct.h"
6363
// CHECK-NEXT: ],
6464
// CHECK-NEXT: "link-libraries": [],
65-
// CHECK-NEXT: "clang-modules-exported": [],
6665
// CHECK-NEXT: "name": "Direct"
6766
// CHECK-NEXT: },
6867
// CHECK-NEXT: {
@@ -76,7 +75,6 @@ module Direct { header "direct.h" }
7675
// CHECK-NEXT: "[[PREFIX]]/transitive.h"
7776
// CHECK-NEXT: ],
7877
// CHECK-NEXT: "link-libraries": [],
79-
// CHECK-NEXT: "clang-modules-exported": [],
8078
// CHECK-NEXT: "name": "Transitive"
8179
// CHECK-NEXT: }
8280
// CHECK-NEXT: ],

‎clang/test/ClangScanDeps/modules-excluded-header.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
// CHECK-NEXT: "file-deps": [
4444
// CHECK: ],
4545
// CHECK-NEXT: "link-libraries": [],
46-
// CHECK-NEXT: "clang-modules-exported": [],
4746
// CHECK-NEXT: "name": "Mod"
4847
// CHECK-NEXT: }
4948
// CHECK-NEXT: ]

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ module third {}
5555
// CHECK-NEXT: "[[PREFIX]]/second/second/sub.modulemap"
5656
// CHECK-NEXT: ],
5757
// CHECK-NEXT: "link-libraries": [],
58-
// CHECK-NEXT: "clang-modules-exported": [],
5958
// CHECK-NEXT: "name": "first"
6059
// CHECK-NEXT: },
6160
// CHECK-NEXT: {
@@ -79,7 +78,6 @@ module third {}
7978
// CHECK-NEXT: "[[PREFIX]]/third/module.modulemap"
8079
// CHECK-NEXT: ],
8180
// CHECK-NEXT: "link-libraries": [],
82-
// CHECK-NEXT: "clang-modules-exported": [],
8381
// CHECK-NEXT: "name": "second"
8482
// CHECK-NEXT: },
8583
// CHECK-NEXT: {
@@ -95,7 +93,6 @@ module third {}
9593
// CHECK-NEXT: "[[PREFIX]]/third/module.modulemap"
9694
// CHECK-NEXT: ],
9795
// CHECK-NEXT: "link-libraries": [],
98-
// CHECK-NEXT: "clang-modules-exported": [],
9996
// CHECK-NEXT: "name": "third"
10097
// CHECK-NEXT: }
10198
// CHECK-NEXT: ],

0 commit comments

Comments
 (0)