Skip to content

Commit 4569287

Browse files
MaskRayMaskRay
committed
[bazel] Fix --features=layering_check issues for llvm/unittests
1 parent 10cef70 commit 4569287

File tree

2 files changed

+57
-1
lines changed

2 files changed

+57
-1
lines changed

‎utils/bazel/llvm-project-overlay/llvm/unittests/BUILD.bazel

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ cc_test(
2323
"//llvm:Core",
2424
"//llvm:Support",
2525
"//llvm:TestingSupport",
26+
"//third-party/unittest:gmock",
2627
"//third-party/unittest:gtest",
2728
"//third-party/unittest:gtest_main",
2829
],
@@ -49,6 +50,8 @@ cc_test(
4950
"//llvm:Support",
5051
"//llvm:TestingSupport",
5152
"//llvm:TransformUtils",
53+
"//llvm:attributes_gen",
54+
"//llvm:config",
5255
"//third-party/unittest:gtest",
5356
"//third-party/unittest:gtest_main",
5457
],
@@ -125,6 +128,7 @@ cc_test(
125128
],
126129
allow_empty = False,
127130
),
131+
features = ["-layering_check"], # #include "../lib/CodeGen/AllocationOrder.h"
128132
deps = [
129133
":codegen_tests_includes",
130134
"//llvm:AllTargetsAsmParsers",
@@ -163,6 +167,7 @@ cc_test(
163167
"//llvm:CodeGen",
164168
"//llvm:Core",
165169
"//llvm:FileCheckLib",
170+
"//llvm:MC",
166171
"//llvm:Support",
167172
"//llvm:Target",
168173
"//third-party/unittest:gtest",
@@ -188,16 +193,23 @@ cc_test(
188193
# work with Bazel.
189194
"--gtest_filter=-NativeSymbolReuseTest.*",
190195
],
196+
features = ["-layering_check"], # #include "../lib/CodeGen/AsmPrinter/DwarfStringPool.h"
191197
deps = [
192198
"//llvm:AllTargetsAsmParsers",
193199
"//llvm:AllTargetsCodeGens",
200+
"//llvm:BinaryFormat",
194201
"//llvm:CodeGen",
195202
"//llvm:Core",
203+
"//llvm:DebugInfo",
196204
"//llvm:DebugInfoDWARF",
197205
"//llvm:DebugInfoPDB",
206+
"//llvm:MC",
207+
"//llvm:Object",
198208
"//llvm:ObjectYAML",
199209
"//llvm:Support",
210+
"//llvm:Target",
200211
"//llvm:TestingSupport",
212+
"//llvm:config",
201213
"//third-party/unittest:gtest",
202214
"//third-party/unittest:gtest_main",
203215
],
@@ -208,7 +220,9 @@ cc_test(
208220
srcs = glob(["Debuginfod/*.cpp"]),
209221
deps = [
210222
"//llvm:Debuginfod",
223+
"//llvm:Support",
211224
"//llvm:TestingSupport",
225+
"//third-party/unittest:gmock",
212226
"//third-party/unittest:gtest",
213227
"//third-party/unittest:gtest_main",
214228
],
@@ -248,12 +262,16 @@ cc_test(
248262
],
249263
deps = [
250264
"//llvm:AllTargetsCodeGens",
265+
"//llvm:Analysis",
251266
"//llvm:AsmParser",
252267
"//llvm:Core",
253268
"//llvm:ExecutionEngine",
269+
"//llvm:MC",
254270
"//llvm:MCJIT",
255271
"//llvm:Passes",
256272
"//llvm:Support",
273+
"//llvm:Target",
274+
"//llvm:config",
257275
"//third-party/unittest:gtest",
258276
"//third-party/unittest:gtest_main",
259277
],
@@ -276,9 +294,16 @@ cc_test(
276294
"//llvm:AsmParser",
277295
"//llvm:Core",
278296
"//llvm:ExecutionEngine",
297+
"//llvm:IRReader",
298+
"//llvm:JITLink",
299+
"//llvm:MC",
300+
"//llvm:Object",
279301
"//llvm:OrcJIT",
302+
"//llvm:OrcShared",
303+
"//llvm:OrcTargetProcess",
280304
"//llvm:Support",
281305
"//llvm:TestingSupport",
306+
"//llvm:config",
282307
"//third-party/unittest:gtest",
283308
"//third-party/unittest:gtest_main",
284309
],
@@ -291,6 +316,7 @@ cc_test(
291316
["FileCheck/*.cpp"],
292317
allow_empty = False,
293318
),
319+
features = ["-layering_check"], # #include "../lib/FileCheck/FileCheckImpl.h"
294320
deps = [
295321
"//llvm:FileCheckLib",
296322
"//llvm:Support",
@@ -317,12 +343,15 @@ cc_test(
317343
"//llvm:Analysis",
318344
"//llvm:AsmParser",
319345
"//llvm:BinaryFormat",
346+
"//llvm:CodeGen",
320347
"//llvm:Core",
321348
"//llvm:Passes",
322349
"//llvm:Scalar",
323350
"//llvm:Support",
324351
"//llvm:TestingSupport",
352+
"//llvm:TransformUtils",
325353
"//llvm:config",
354+
"//third-party/unittest:gmock",
326355
"//third-party/unittest:gtest",
327356
"//third-party/unittest:gtest_main",
328357
],
@@ -352,10 +381,12 @@ cc_test(
352381
),
353382
deps = [
354383
"//llvm:Analysis",
384+
"//llvm:Core",
355385
"//llvm:FrontendOpenACC",
356386
"//llvm:FrontendOpenMP",
357387
"//llvm:Passes",
358388
"//llvm:Support",
389+
"//llvm:TransformUtils",
359390
"//third-party/unittest:gtest",
360391
"//third-party/unittest:gtest_main",
361392
],
@@ -388,9 +419,12 @@ cc_test(
388419
deps = [
389420
"//llvm:AllTargetsCodeGens",
390421
"//llvm:AllTargetsDisassemblers",
422+
"//llvm:BinaryFormat",
391423
"//llvm:MC",
392424
"//llvm:MCDisassembler",
425+
"//llvm:Object",
393426
"//llvm:Support",
427+
"//llvm:Target",
394428
"//third-party/unittest:gtest",
395429
"//third-party/unittest:gtest_main",
396430
],
@@ -408,6 +442,7 @@ cc_test(
408442
"//llvm:AllTargetsCodeGens",
409443
"//llvm:CodeGen",
410444
"//llvm:Core",
445+
"//llvm:MC",
411446
"//llvm:Support",
412447
"//llvm:Target",
413448
"//third-party/unittest:gtest",
@@ -425,6 +460,7 @@ cc_test(
425460
"//llvm:ObjCopy",
426461
"//llvm:Object",
427462
"//llvm:ObjectYAML",
463+
"//llvm:Support",
428464
"//llvm:TestingSupport",
429465
"//third-party/unittest:gtest",
430466
"//third-party/unittest:gtest_main",
@@ -439,8 +475,10 @@ cc_test(
439475
allow_empty = False,
440476
),
441477
deps = [
478+
"//llvm:BinaryFormat",
442479
"//llvm:Object",
443480
"//llvm:ObjectYAML",
481+
"//llvm:Support",
444482
"//llvm:TestingSupport",
445483
"//third-party/unittest:gtest",
446484
"//third-party/unittest:gtest_main",
@@ -550,9 +588,13 @@ cc_test(
550588
deps = [
551589
"//llvm:Core",
552590
"//llvm:Coverage",
591+
"//llvm:DebugInfo",
592+
"//llvm:Object",
553593
"//llvm:ProfileData",
554594
"//llvm:Support",
595+
"//llvm:Symbolize",
555596
"//llvm:TestingSupport",
597+
"//third-party/unittest:gmock",
556598
"//third-party/unittest:gtest",
557599
"//third-party/unittest:gtest_main",
558600
],
@@ -587,6 +629,7 @@ cc_test(
587629
"//llvm:Support",
588630
"//llvm:TestingSupport",
589631
"//llvm:config",
632+
"//third-party/unittest:gmock",
590633
"//third-party/unittest:gtest",
591634
"//third-party/unittest:gtest_main",
592635
],
@@ -624,6 +667,7 @@ cc_test(
624667
"//llvm:Support",
625668
"//llvm:TableGen",
626669
"//llvm:tblgen",
670+
"//third-party/unittest:gmock",
627671
"//third-party/unittest:gtest",
628672
"//third-party/unittest:gtest_main",
629673
],
@@ -641,6 +685,12 @@ cc_test(
641685
],
642686
deps = [
643687
"//llvm:AArch64CodeGen",
688+
"//llvm:AArch64UtilsAndDesc",
689+
"//llvm:AsmParser",
690+
"//llvm:CodeGen",
691+
"//llvm:Core",
692+
"//llvm:MC",
693+
"//llvm:Support",
644694
"//third-party/unittest:gtest",
645695
"//third-party/unittest:gtest_main",
646696
],
@@ -679,10 +729,12 @@ cc_test(
679729
"//llvm:AsmParser",
680730
"//llvm:Core",
681731
"//llvm:IPO",
732+
"//llvm:IRReader",
682733
"//llvm:Passes",
683734
"//llvm:Support",
684735
"//llvm:TestingSupport",
685736
"//llvm:TransformUtils",
737+
"//llvm:Vectorize",
686738
"//third-party/unittest:gtest",
687739
"//third-party/unittest:gtest_main",
688740
],
@@ -704,11 +756,15 @@ cc_test(
704756
deps = [
705757
"//llvm:AllTargetsCodeGens",
706758
"//llvm:AllTargetsDisassemblers",
759+
"//llvm:CodeGen",
707760
"//llvm:Exegesis",
708761
"//llvm:MC",
709762
"//llvm:MCDisassembler",
710763
"//llvm:Support",
711764
"//llvm:TestingSupport",
765+
"//llvm:X86CodeGen",
766+
"//llvm:X86UtilsAndDesc",
767+
"//third-party/unittest:gmock",
712768
"//third-party/unittest:gtest",
713769
"//third-party/unittest:gtest_main",
714770
],

‎utils/bazel/llvm-project-overlay/third-party/unittest/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ cc_library(
5151
],
5252
) + [
5353
],
54-
hdrs = ["googletest/include/gtest/gtest.h"],
54+
hdrs = ["googletest/include/gtest/gtest.h", "googletest/include/gtest/gtest-spi.h"],
5555
copts = llvm_copts,
5656
defines = [
5757
"GTEST_HAS_RTTI=0",

0 commit comments

Comments
 (0)