Skip to content

Commit c42acae

Browse files
committed
[bazel] fix pdlp tests
1 parent 88b857d commit c42acae

File tree

2 files changed

+11
-44
lines changed

2 files changed

+11
-44
lines changed

ortools/pdlp/BUILD.bazel

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ cc_test(
3636
name = "scheduler_test",
3737
srcs = ["scheduler_test.cc"],
3838
deps = [
39-
":gtest_main",
4039
":scheduler",
4140
":solvers_cc_proto",
41+
"//ortools/base:gmock_main",
4242
"@abseil-cpp//absl/functional:any_invocable",
4343
],
4444
)
@@ -77,15 +77,6 @@ py_proto_library(
7777
],
7878
)
7979

80-
cc_library(
81-
name = "gtest_main",
82-
srcs = ["gtest_main.cc"],
83-
deps = [
84-
"//ortools/base",
85-
"//ortools/base:gmock",
86-
],
87-
)
88-
8980
cc_library(
9081
name = "iteration_stats",
9182
srcs = ["iteration_stats.cc"],
@@ -107,13 +98,13 @@ cc_test(
10798
name = "iteration_stats_test",
10899
srcs = ["iteration_stats_test.cc"],
109100
deps = [
110-
":gtest_main",
111101
":iteration_stats",
112102
":quadratic_program",
113103
":sharded_quadratic_program",
114104
":solve_log_cc_proto",
115105
":solvers_cc_proto",
116106
":test_util",
107+
"//ortools/base:gmock_main",
117108
"//ortools/base:protobuf_util",
118109
"@eigen",
119110
],
@@ -162,7 +153,6 @@ cc_test(
162153
srcs = ["primal_dual_hybrid_gradient_test.cc"],
163154
shard_count = 3,
164155
deps = [
165-
":gtest_main",
166156
":iteration_stats",
167157
":primal_dual_hybrid_gradient",
168158
":quadratic_program",
@@ -173,6 +163,7 @@ cc_test(
173163
":termination",
174164
":test_util",
175165
"//ortools/base",
166+
"//ortools/base:gmock_main",
176167
"//ortools/glop:parameters_cc_proto",
177168
"//ortools/linear_solver:linear_solver_cc_proto",
178169
"//ortools/lp_data",
@@ -204,9 +195,9 @@ cc_test(
204195
size = "small",
205196
srcs = ["quadratic_program_test.cc"],
206197
deps = [
207-
":gtest_main",
208198
":quadratic_program",
209199
":test_util",
200+
"//ortools/base:gmock_main",
210201
"//ortools/base:protobuf_util",
211202
"//ortools/base:status_macros",
212203
"//ortools/linear_solver:linear_solver_cc_proto",
@@ -260,13 +251,13 @@ cc_test(
260251
size = "small",
261252
srcs = ["sharded_optimization_utils_test.cc"],
262253
deps = [
263-
":gtest_main",
264254
":quadratic_program",
265255
":sharded_optimization_utils",
266256
":sharded_quadratic_program",
267257
":sharder",
268258
":solve_log_cc_proto",
269259
":test_util",
260+
"//ortools/base:gmock_main",
270261
"@eigen",
271262
],
272263
)
@@ -292,11 +283,11 @@ cc_test(
292283
name = "sharded_quadratic_program_test",
293284
srcs = ["sharded_quadratic_program_test.cc"],
294285
deps = [
295-
":gtest_main",
296286
":quadratic_program",
297287
":sharded_quadratic_program",
298288
":sharder",
299289
":test_util",
290+
"//ortools/base:gmock_main",
300291
"@eigen",
301292
],
302293
)
@@ -324,11 +315,11 @@ cc_test(
324315
size = "small",
325316
srcs = ["sharder_test.cc"],
326317
deps = [
327-
":gtest_main",
328318
":scheduler",
329319
":sharder",
330320
":solvers_cc_proto",
331321
"//ortools/base",
322+
"//ortools/base:gmock_main",
332323
"//ortools/base:mathutil",
333324
"@abseil-cpp//absl/random:distributions",
334325
"@eigen",
@@ -351,9 +342,9 @@ cc_test(
351342
name = "solvers_proto_validation_test",
352343
srcs = ["solvers_proto_validation_test.cc"],
353344
deps = [
354-
":gtest_main",
355345
":solvers_cc_proto",
356346
":solvers_proto_validation",
347+
"//ortools/base:gmock_main",
357348
"//ortools/base:protobuf_util",
358349
"@abseil-cpp//absl/status",
359350
"@abseil-cpp//absl/strings",
@@ -376,10 +367,10 @@ cc_test(
376367
size = "small",
377368
srcs = ["termination_test.cc"],
378369
deps = [
379-
":gtest_main",
380370
":solve_log_cc_proto",
381371
":solvers_cc_proto",
382372
":termination",
373+
"//ortools/base:gmock_main",
383374
"//ortools/base:protobuf_util",
384375
],
385376
)
@@ -402,9 +393,9 @@ cc_test(
402393
name = "test_util_test",
403394
srcs = ["test_util_test.cc"],
404395
deps = [
405-
":gtest_main",
406396
":test_util",
407397
"//ortools/base",
398+
"//ortools/base:gmock_main",
408399
"@abseil-cpp//absl/types:span",
409400
"@eigen",
410401
],
@@ -430,13 +421,13 @@ cc_test(
430421
name = "trust_region_test",
431422
srcs = ["trust_region_test.cc"],
432423
deps = [
433-
":gtest_main",
434424
":quadratic_program",
435425
":sharded_optimization_utils",
436426
":sharded_quadratic_program",
437427
":sharder",
438428
":test_util",
439429
":trust_region",
430+
"//ortools/base:gmock_main",
440431
"@abseil-cpp//absl/strings",
441432
"@eigen",
442433
],

ortools/pdlp/gtest_main.cc

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)