Change remaining test targets to use select_gtest() to choose the gtest target

Should be a no-op as select_gtest() returns the same target as before.

PiperOrigin-RevId: 607788473
This commit is contained in:
gVisor bot
2024-02-16 13:45:58 -08:00
parent aa1a66353a
commit 53d2b511e7
3 changed files with 495 additions and 762 deletions
+27 -53
View File
@@ -1,4 +1,4 @@
load("//tools:defs.bzl", "cc_binary", "gbenchmark", "gtest")
load("//tools:defs.bzl", "cc_binary", "gbenchmark", "select_gtest")
package(
default_applicable_licenses = ["//:license"],
@@ -18,9 +18,8 @@ cc_binary(
srcs = [
"getpid_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:test_main",
],
)
@@ -31,9 +30,8 @@ cc_binary(
srcs = [
"send_recv_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:file_descriptor",
"//test/util:logging",
"//test/util:posix_error",
@@ -51,9 +49,8 @@ cc_binary(
srcs = [
"gettid_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:test_main",
],
)
@@ -64,9 +61,8 @@ cc_binary(
srcs = [
"sched_yield_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:test_main",
"//test/util:test_util",
],
@@ -78,9 +74,8 @@ cc_binary(
srcs = [
"clock_getres_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:test_main",
],
)
@@ -91,9 +86,8 @@ cc_binary(
srcs = [
"clock_gettime_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:test_main",
"@com_google_absl//absl/time",
],
@@ -105,9 +99,8 @@ cc_binary(
srcs = [
"open_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:fs_util",
"//test/util:logging",
"//test/util:temp_path",
@@ -121,9 +114,8 @@ cc_binary(
srcs = [
"dup_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:fs_util",
"//test/util:logging",
"//test/util:temp_path",
@@ -137,9 +129,8 @@ cc_binary(
srcs = [
"read_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:fs_util",
"//test/util:logging",
"//test/util:temp_path",
@@ -154,9 +145,8 @@ cc_binary(
srcs = [
"randread_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:file_descriptor",
"//test/util:logging",
"//test/util:temp_path",
@@ -172,9 +162,8 @@ cc_binary(
srcs = [
"write_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:logging",
"//test/util:temp_path",
"//test/util:test_main",
@@ -188,9 +177,8 @@ cc_binary(
srcs = [
"seqwrite_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:logging",
"//test/util:temp_path",
"//test/util:test_main",
@@ -205,9 +193,8 @@ cc_binary(
srcs = [
"pipe_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:logging",
"//test/util:test_main",
"//test/util:test_util",
@@ -221,9 +208,8 @@ cc_binary(
srcs = [
"fork_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:cleanup",
"//test/util:file_descriptor",
"//test/util:logging",
@@ -240,9 +226,8 @@ cc_binary(
srcs = [
"futex_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:logging",
"//test/util:test_main",
"//test/util:thread_util",
@@ -256,9 +241,8 @@ cc_binary(
srcs = [
"epoll_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:epoll_util",
"//test/util:eventfd_util",
"//test/util:file_descriptor",
@@ -275,9 +259,8 @@ cc_binary(
srcs = [
"poll_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:eventfd_util",
"//test/util:file_descriptor",
"//test/util:posix_error",
@@ -293,9 +276,8 @@ cc_binary(
srcs = [
"select_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:eventfd_util",
"//test/util:file_descriptor",
"//test/util:posix_error",
@@ -311,9 +293,8 @@ cc_binary(
srcs = [
"death_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:logging",
"//test/util:test_main",
],
@@ -325,9 +306,8 @@ cc_binary(
srcs = [
"mapping_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:logging",
"//test/util:memory_util",
"//test/util:posix_error",
@@ -342,9 +322,8 @@ cc_binary(
srcs = [
"signal_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:logging",
"//test/util:test_main",
"//test/util:test_util",
@@ -357,9 +336,8 @@ cc_binary(
srcs = [
"getdents_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:file_descriptor",
"//test/util:fs_util",
"//test/util:temp_path",
@@ -374,9 +352,8 @@ cc_binary(
srcs = [
"sleep_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:logging",
"//test/util:test_main",
],
@@ -388,9 +365,8 @@ cc_binary(
srcs = [
"stat_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:fs_util",
"//test/util:temp_path",
"//test/util:test_main",
@@ -405,9 +381,8 @@ cc_binary(
srcs = [
"unlink_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:fs_util",
"//test/util:temp_path",
"//test/util:test_main",
@@ -421,9 +396,8 @@ cc_binary(
srcs = [
"open_read_close_benchmark.cc",
],
deps = [
deps = select_gtest() + [
gbenchmark,
gtest,
"//test/util:fs_util",
"//test/util:logging",
"//test/util:temp_path",
+449 -673
View File
File diff suppressed because it is too large Load Diff
+19 -36
View File
@@ -1,4 +1,4 @@
load("//tools:defs.bzl", "cc_library", "cc_test", "coreutil", "default_net_util", "gbenchmark_internal", "gtest", "select_system")
load("//tools:defs.bzl", "cc_library", "cc_test", "coreutil", "default_net_util", "gbenchmark_internal", "select_gtest", "select_system")
package(
default_applicable_licenses = ["//:license"],
@@ -43,13 +43,12 @@ cc_library(
name = "file_descriptor",
testonly = 1,
hdrs = ["file_descriptor.h"],
deps = [
deps = select_gtest() + [
":logging",
":posix_error",
":save_util",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
gtest,
],
)
@@ -79,7 +78,7 @@ cc_library(
testonly = 1,
srcs = ["proc_util.cc"],
hdrs = ["proc_util.h"],
deps = [
deps = select_gtest() + [
":fs_util",
":posix_error",
":test_util",
@@ -87,7 +86,6 @@ cc_library(
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:optional",
gtest,
],
)
@@ -95,11 +93,10 @@ cc_test(
name = "proc_util_test",
size = "small",
srcs = ["proc_util_test.cc"],
deps = [
deps = select_gtest() + [
":proc_util",
":test_main",
":test_util",
gtest,
],
)
@@ -114,13 +111,12 @@ cc_library(
testonly = 1,
srcs = ["fs_util.cc"],
hdrs = ["fs_util.h"],
deps = [
deps = select_gtest() + [
":cleanup",
":file_descriptor",
":posix_error",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/time",
gtest,
],
)
@@ -128,13 +124,12 @@ cc_test(
name = "fs_util_test",
size = "small",
srcs = ["fs_util_test.cc"],
deps = [
deps = select_gtest() + [
":fs_util",
":posix_error",
":temp_path",
":test_main",
":test_util",
gtest,
],
)
@@ -164,7 +159,7 @@ cc_library(
testonly = 1,
srcs = ["mount_util.cc"],
hdrs = ["mount_util.h"],
deps = [
deps = select_gtest() + [
":cleanup",
":posix_error",
":temp_path",
@@ -172,7 +167,6 @@ cc_library(
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
gtest,
"@com_google_absl//absl/types:span",
],
)
@@ -181,11 +175,10 @@ cc_test(
name = "mount_util_test",
size = "small",
srcs = ["mount_util_test.cc"],
deps = [
deps = select_gtest() + [
":mount_util",
":test_main",
":test_util",
gtest,
],
)
@@ -210,16 +203,15 @@ cc_library(
testonly = 1,
srcs = ["multiprocess_util.cc"],
hdrs = ["multiprocess_util.h"],
deps = [
deps = select_gtest() + [
":cleanup",
":file_descriptor",
":logging",
":posix_error",
":save_util",
":test_util",
"@com_google_absl//absl/strings:str_format",
gtest,
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
],
)
@@ -236,12 +228,11 @@ cc_library(
testonly = 1,
srcs = ["posix_error.cc"],
hdrs = ["posix_error.h"],
deps = [
deps = select_gtest() + [
":logging",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:variant",
gtest,
],
)
@@ -249,10 +240,9 @@ cc_test(
name = "posix_error_test",
size = "small",
srcs = ["posix_error_test.cc"],
deps = [
deps = select_gtest() + [
":posix_error",
":test_main",
gtest,
],
)
@@ -272,12 +262,11 @@ cc_library(
testonly = 1,
srcs = ["signal_util.cc"],
hdrs = ["signal_util.h"],
deps = [
deps = select_gtest() + [
":cleanup",
":file_descriptor",
":posix_error",
":test_util",
gtest,
],
)
@@ -286,13 +275,12 @@ cc_library(
testonly = 1,
srcs = ["temp_path.cc"],
hdrs = ["temp_path.h"],
deps = [
deps = select_gtest() + [
":fs_util",
":posix_error",
":test_util",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/time",
gtest,
],
)
@@ -306,7 +294,7 @@ cc_library(
],
hdrs = ["test_util.h"],
defines = select_system(),
deps = coreutil() + [
deps = coreutil() + select_gtest() + [
":fs_util",
":logging",
":posix_error",
@@ -318,7 +306,6 @@ cc_library(
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/time",
gtest,
gbenchmark_internal,
],
)
@@ -345,13 +332,12 @@ cc_library(
testonly = 1,
srcs = ["timer_util.cc"],
hdrs = ["timer_util.h"],
deps = [
deps = select_gtest() + [
":cleanup",
":logging",
":posix_error",
":test_util",
"@com_google_absl//absl/time",
gtest,
],
)
@@ -359,10 +345,9 @@ cc_test(
name = "test_util_test",
size = "small",
srcs = ["test_util_test.cc"],
deps = [
deps = select_gtest() + [
":test_main",
":test_util",
gtest,
],
)
@@ -378,11 +363,10 @@ cc_library(
testonly = 1,
srcs = ["epoll_util.cc"],
hdrs = ["epoll_util.h"],
deps = [
deps = select_gtest() + [
":file_descriptor",
":posix_error",
":save_util",
gtest,
],
)
@@ -442,8 +426,7 @@ cc_library(
],
hdrs = ["socket_util.h"],
defines = select_system(),
deps = default_net_util() + [
gtest,
deps = default_net_util() + select_gtest() + [
"//test/util:file_descriptor",
"//test/util:posix_error",
"//test/util:temp_path",