Skip to content

Commit 1c73e14

Browse files
Google-ML-AutomationGoogle-ML-Automation
committed
Make xla_cc_test default to static linking, so that we can catch bugs where duplicated symbols are linked into the same test (e.g. having main()s from different libraries), which is unintended and leads to wrong/surprising test behavior, as we don't know for sure which main() the linker will use.
To keep the size of the change manageable, we don't change the behaviors of xla_test and tsl_cc_test yet. They will be updated later. PiperOrigin-RevId: 726227967
1 parent 0402227 commit 1c73e14

File tree

31 files changed

+130
-144
lines changed

31 files changed

+130
-144
lines changed

‎xla/BUILD

+18-25
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ xla_cc_test(
9292
":bit_cast",
9393
"//xla/hlo/testlib:test",
9494
"//xla/tsl/platform:test_main",
95-
"@com_google_googletest//:gtest_main",
95+
"@com_google_googletest//:gtest",
9696
"@eigen_archive//:eigen3",
9797
"@tsl//tsl/platform:bfloat16",
9898
],
@@ -134,7 +134,7 @@ xla_cc_test(
134134
":xla_data_proto_cc",
135135
"//xla/hlo/testlib:test",
136136
"//xla/tsl/platform:test_main",
137-
"@com_google_googletest//:gtest_main",
137+
"@com_google_googletest//:gtest",
138138
],
139139
)
140140

@@ -167,7 +167,7 @@ xla_cc_test(
167167
"@com_google_absl//absl/log:log_streamer",
168168
"@com_google_absl//absl/random",
169169
"@com_google_absl//absl/types:span",
170-
"@com_google_googletest//:gtest_main",
170+
"@com_google_googletest//:gtest",
171171
],
172172
)
173173

@@ -232,7 +232,6 @@ xla_cc_test(
232232
"//xla/hlo/testlib:test",
233233
"//xla/tsl/platform:test_main",
234234
"@com_google_googletest//:gtest",
235-
"@com_google_googletest//:gtest_main",
236235
],
237236
)
238237

@@ -271,7 +270,6 @@ xla_cc_test(
271270
"@com_google_absl//absl/status",
272271
"@com_google_absl//absl/status:statusor",
273272
"@com_google_googletest//:gtest",
274-
"@com_google_googletest//:gtest_main",
275273
],
276274
)
277275

@@ -297,7 +295,7 @@ xla_cc_test(
297295
"//xla/tsl/platform:test_main",
298296
"@com_google_absl//absl/base",
299297
"@com_google_absl//absl/numeric:bits",
300-
"@com_google_googletest//:gtest_main",
298+
"@com_google_googletest//:gtest",
301299
"@tsl//tsl/platform:ml_dtypes",
302300
],
303301
)
@@ -363,7 +361,6 @@ xla_cc_test(
363361
"@com_google_absl//absl/strings:string_view",
364362
"@com_google_absl//absl/types:span",
365363
"@com_google_googletest//:gtest",
366-
"@com_google_googletest//:gtest_main",
367364
"@ml_dtypes_py//ml_dtypes:float8",
368365
"@tsl//tsl/platform:ml_dtypes",
369366
],
@@ -389,7 +386,7 @@ xla_cc_test(
389386
":permutation_util",
390387
"//xla/hlo/testlib:test",
391388
"//xla/tsl/platform:test_main",
392-
"@com_google_googletest//:gtest_main",
389+
"@com_google_googletest//:gtest",
393390
],
394391
)
395392

@@ -418,7 +415,7 @@ xla_cc_test(
418415
":util",
419416
"//xla/hlo/testlib:test",
420417
"//xla/tsl/platform:test_main",
421-
"@com_google_googletest//:gtest_main",
418+
"@com_google_googletest//:gtest",
422419
],
423420
)
424421

@@ -531,7 +528,7 @@ xla_cc_test(
531528
"//xla/hlo/testlib:test_helpers",
532529
"//xla/tsl/platform:statusor",
533530
"//xla/tsl/platform:test_main",
534-
"@com_google_googletest//:gtest_main",
531+
"@com_google_googletest//:gtest",
535532
],
536533
)
537534

@@ -549,7 +546,7 @@ xla_cc_test(
549546
"//xla/tsl/platform:test_main",
550547
"@com_google_absl//absl/log",
551548
"@com_google_absl//absl/types:span",
552-
"@com_google_googletest//:gtest_main",
549+
"@com_google_googletest//:gtest",
553550
],
554551
)
555552

@@ -561,7 +558,7 @@ xla_cc_test(
561558
":xla_data_proto_cc",
562559
"//xla/hlo/testlib:test",
563560
"//xla/tsl/platform:test_main",
564-
"@com_google_googletest//:gtest_main",
561+
"@com_google_googletest//:gtest",
565562
],
566563
)
567564

@@ -574,7 +571,7 @@ xla_cc_test(
574571
"//xla/hlo/testlib:test",
575572
"//xla/tsl/platform:test_main",
576573
"@com_google_absl//absl/types:span",
577-
"@com_google_googletest//:gtest_main",
574+
"@com_google_googletest//:gtest",
578575
],
579576
)
580577

@@ -676,7 +673,7 @@ xla_cc_test(
676673
":literal_util",
677674
"//xla/tsl/platform:test",
678675
"//xla/tsl/platform:test_main",
679-
"@com_google_googletest//:gtest_main",
676+
"@com_google_googletest//:gtest",
680677
],
681678
)
682679

@@ -726,7 +723,7 @@ xla_cc_test(
726723
"//xla/hlo/testlib:test_helpers",
727724
"//xla/tsl/lib/core:status_test_util",
728725
"//xla/tsl/platform:test_main",
729-
"@com_google_googletest//:gtest_main",
726+
"@com_google_googletest//:gtest",
730727
"@tsl//tsl/platform:ml_dtypes",
731728
],
732729
)
@@ -804,7 +801,7 @@ xla_cc_test(
804801
"//xla/tsl/platform:test_main",
805802
"@com_google_absl//absl/strings:string_view",
806803
"@com_google_absl//absl/types:span",
807-
"@com_google_googletest//:gtest_main",
804+
"@com_google_googletest//:gtest",
808805
"@eigen_archive//:eigen3",
809806
],
810807
)
@@ -829,7 +826,7 @@ xla_cc_test(
829826
":array2d",
830827
"//xla/hlo/testlib:test",
831828
"//xla/tsl/platform:test_main",
832-
"@com_google_googletest//:gtest_main",
829+
"@com_google_googletest//:gtest",
833830
"@eigen_archive//:eigen3",
834831
"@tsl//tsl/platform:ml_dtypes",
835832
],
@@ -854,7 +851,7 @@ xla_cc_test(
854851
":types",
855852
"//xla/hlo/testlib:test",
856853
"//xla/tsl/platform:test_main",
857-
"@com_google_googletest//:gtest_main",
854+
"@com_google_googletest//:gtest",
858855
],
859856
)
860857

@@ -882,7 +879,7 @@ xla_cc_test(
882879
"//xla/tsl/platform:test_main",
883880
"@com_google_absl//absl/log",
884881
"@com_google_absl//absl/types:span",
885-
"@com_google_googletest//:gtest_main",
882+
"@com_google_googletest//:gtest",
886883
"@eigen_archive//:eigen3",
887884
],
888885
)
@@ -971,7 +968,6 @@ xla_cc_test(
971968
"//xla/tsl/platform:env",
972969
"//xla/tsl/platform:test_main",
973970
"@com_google_googletest//:gtest",
974-
"@com_google_googletest//:gtest_main",
975971
],
976972
)
977973

@@ -1008,7 +1004,6 @@ xla_cc_test(
10081004
"//xla/tsl/platform:env",
10091005
"//xla/tsl/platform:test_main",
10101006
"@com_google_googletest//:gtest",
1011-
"@com_google_googletest//:gtest_main",
10121007
],
10131008
)
10141009

@@ -1088,7 +1083,6 @@ xla_cc_test(
10881083
"//xla/hlo/testlib:test",
10891084
"//xla/tsl/platform:test_main",
10901085
"@com_google_googletest//:gtest",
1091-
"@com_google_googletest//:gtest_main",
10921086
],
10931087
)
10941088

@@ -1139,7 +1133,6 @@ xla_cc_test(
11391133
"//xla/tests:literal_test_util",
11401134
"//xla/tsl/platform:test_main",
11411135
"@com_google_googletest//:gtest",
1142-
"@com_google_googletest//:gtest_main",
11431136
],
11441137
)
11451138

@@ -1323,7 +1316,7 @@ xla_cc_test(
13231316
"//xla/hlo/testlib:test_helpers",
13241317
"//xla/tsl/platform:statusor",
13251318
"//xla/tsl/platform:test_main",
1326-
"@com_google_googletest//:gtest_main",
1319+
"@com_google_googletest//:gtest",
13271320
],
13281321
)
13291322

@@ -1381,7 +1374,7 @@ xla_cc_test(
13811374
"//xla/tsl/platform:status_matchers",
13821375
"//xla/tsl/platform:test",
13831376
"//xla/tsl/platform:test_main",
1384-
"@com_google_googletest//:gtest_main",
1377+
"@com_google_googletest//:gtest",
13851378
],
13861379
)
13871380

‎xla/backends/cpu/collectives/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ cc_library(
221221
xla_cc_test(
222222
name = "gloo_collectives_test",
223223
srcs = ["gloo_collectives_test.cc"],
224-
linkstatic = True,
225224
deps = [
226225
":gloo_collectives",
227226
":gloo_kv_store",

‎xla/backends/cpu/runtime/xnnpack/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ xla_cc_test(
6666
"@XNNPACK",
6767
"@com_google_absl//absl/algorithm:container",
6868
"@com_google_absl//absl/synchronization",
69-
"@com_google_googletest//:gtest_main",
69+
"@com_google_googletest//:gtest",
7070
"@eigen_archive//:eigen3",
7171
"@pthreadpool",
7272
],

‎xla/backends/cpu/testlib/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ xla_cc_test(
7171
"//xla/tsl/platform:test_main",
7272
"@com_google_absl//absl/status",
7373
"@com_google_absl//absl/strings:string_view",
74-
"@com_google_googletest//:gtest_main",
74+
"@com_google_googletest//:gtest",
7575
],
7676
)
7777

@@ -155,7 +155,7 @@ xla_cc_test(
155155
"//xla/tsl/platform:test",
156156
"//xla/tsl/platform:test_main",
157157
"@com_google_absl//absl/strings:string_view",
158-
"@com_google_googletest//:gtest_main",
158+
"@com_google_googletest//:gtest",
159159
"@llvm-project//llvm:JITLink",
160160
"@llvm-project//llvm:ir_headers",
161161
"@tsl//tsl/platform:casts",

‎xla/backends/gpu/codegen/triton/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ xla_test(
630630
"//xla/stream_executor:device_description",
631631
"//xla/tests:xla_internal_test_main",
632632
"@com_google_absl//absl/strings:string_view",
633-
"@com_google_googletest//:gtest_main",
633+
"@com_google_googletest//:gtest",
634634
"@llvm-project//mlir:IR",
635635
"@tsl//tsl/platform:status_matchers",
636636
"@tsl//tsl/platform:statusor",

‎xla/backends/gpu/collectives/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ xla_cc_test(
8282
"@com_google_absl//absl/container:btree",
8383
"@com_google_absl//absl/status",
8484
"@com_google_googletest//:gtest",
85-
"@com_google_googletest//:gtest_main",
8685
],
8786
)
8887

‎xla/client/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ xla_cc_test(
106106
"@com_google_absl//absl/status",
107107
"@com_google_absl//absl/status:statusor",
108108
"@com_google_googletest//:gtest",
109-
"@com_google_googletest//:gtest_main",
110109
"@tsl//tsl/platform:protobuf",
111110
],
112111
)

‎xla/hlo/ir/BUILD

+4-4
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ xla_cc_test(
126126
"//xla:shape_util",
127127
"//xla:xla_data_proto_cc",
128128
"//xla/tsl/platform:test_main",
129-
"@com_google_googletest//:gtest_main",
129+
"@com_google_googletest//:gtest",
130130
],
131131
)
132132

@@ -214,7 +214,7 @@ xla_cc_test(
214214
"//xla/tsl/platform:test_main",
215215
"@com_google_absl//absl/strings:string_view",
216216
"@com_google_absl//absl/synchronization",
217-
"@com_google_googletest//:gtest_main",
217+
"@com_google_googletest//:gtest",
218218
],
219219
)
220220

@@ -256,7 +256,7 @@ xla_cc_test(
256256
"//xla/hlo/utils:hlo_query",
257257
"//xla/tsl/platform:test",
258258
"//xla/tsl/platform:test_main",
259-
"@com_google_googletest//:gtest_main",
259+
"@com_google_googletest//:gtest",
260260
],
261261
)
262262

@@ -323,7 +323,7 @@ xla_cc_test(
323323
"//xla/service:hlo_proto_cc",
324324
"//xla/tsl/platform:test_main",
325325
"@com_google_absl//absl/log:globals",
326-
"@com_google_googletest//:gtest_main",
326+
"@com_google_googletest//:gtest",
327327
],
328328
)
329329

‎xla/hlo/parser/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ xla_cc_test(
9494
"@com_google_absl//absl/strings",
9595
"@com_google_absl//absl/types:span",
9696
"@com_google_googletest//:gtest",
97-
"@com_google_googletest//:gtest_main",
9897
],
9998
)
10099

‎xla/hlo/pass/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,6 @@ xla_cc_test(
125125
"@com_google_absl//absl/status:statusor",
126126
"@com_google_absl//absl/strings:string_view",
127127
"@com_google_absl//absl/types:span",
128-
"@com_google_googletest//:gtest_main",
128+
"@com_google_googletest//:gtest",
129129
],
130130
)

‎xla/hlo/translate/hlo_to_mhlo/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ xla_cc_test(
205205
"//xla/tsl/platform:statusor",
206206
"//xla/tsl/platform:test_main",
207207
"@com_google_googletest//:gtest",
208-
"@com_google_googletest//:gtest_main",
209208
"@llvm-project//mlir:IR",
210209
"@llvm-project//mlir:Support",
211210
],

‎xla/hlo/translate/mhlo_to_hlo/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ xla_cc_test(
223223
"//xla/tsl/platform:status_matchers",
224224
"//xla/tsl/platform:test",
225225
"//xla/tsl/platform:test_main",
226-
"@com_google_googletest//:gtest_main",
226+
"@com_google_googletest//:gtest",
227227
"@llvm-project//mlir:FuncDialect",
228228
"@llvm-project//mlir:IR",
229229
"@llvm-project//mlir:Parser",
@@ -313,7 +313,7 @@ xla_cc_test(
313313
"//xla/mlir_hlo",
314314
"//xla/tsl/platform:test_main",
315315
"@com_google_absl//absl/status:statusor",
316-
"@com_google_googletest//:gtest_main",
316+
"@com_google_googletest//:gtest",
317317
"@llvm-project//llvm:Support",
318318
"@llvm-project//mlir:IR",
319319
"@stablehlo//:stablehlo_ops",

‎xla/mlir/utils/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@ cc_library(
3434
cc_test(
3535
name = "error_util_test",
3636
srcs = ["error_util_test.cc"],
37+
linkstatic = 1,
3738
deps = [
3839
":error_util",
3940
"//xla/tsl/lib/core:status_test_util",
4041
"//xla/tsl/platform:status",
4142
"//xla/tsl/platform:test_main",
4243
"@com_google_absl//absl/status",
4344
"@com_google_absl//absl/strings",
44-
"@com_google_googletest//:gtest_main",
45+
"@com_google_googletest//:gtest",
4546
"@llvm-project//llvm:Support",
4647
"@llvm-project//mlir:IR",
4748
],
@@ -74,7 +75,6 @@ xla_cc_test(
7475
"//xla/tsl/platform:test_main",
7576
"@com_google_absl//absl/functional:function_ref",
7677
"@com_google_googletest//:gtest",
77-
"@com_google_googletest//:gtest_main",
7878
"@llvm-project//llvm:Support",
7979
"@llvm-project//mlir:IR",
8080
],

‎xla/pjrt/cpu/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ xla_cc_test(
1919
":cpu_client",
2020
"//xla/pjrt:pjrt_client_test_common",
2121
"//xla/tsl/platform:test_main",
22-
"@com_google_googletest//:gtest_main",
22+
"@com_google_googletest//:gtest",
2323
],
2424
)
2525

0 commit comments

Comments
 (0)