From e21ac5489e8d87b4862eb6525593dbeed9f3a2ee Mon Sep 17 00:00:00 2001
From: gVisor bot <gvisor-bot@google.com>
Date: Tue, 13 Feb 2024 15:06:00 -0800
Subject: [PATCH] Change some test targets to use select_gtest() to return the
 gtest target.

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

PiperOrigin-RevId: 606760041
---
 test/syscalls/linux/BUILD | 14 ++++++--------
 tools/bazeldefs/cc.bzl    |  3 +++
 tools/defs.bzl            |  7 ++++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/test/syscalls/linux/BUILD b/test/syscalls/linux/BUILD
index 0f186564d..2500f402e 100644
--- a/test/syscalls/linux/BUILD
+++ b/test/syscalls/linux/BUILD
@@ -1,5 +1,5 @@
 load("//tools:arch.bzl", "select_arch")
-load("//tools:defs.bzl", "cc_binary", "cc_library", "gbenchmark", "gtest", "select_system")
+load("//tools:defs.bzl", "cc_binary", "cc_library", "gbenchmark", "gtest", "select_gtest", "select_system")
 
 package(
     default_applicable_licenses = ["//:license"],
@@ -424,15 +424,14 @@ cc_binary(
         "//test/util:capability_util",
         "//test/util:file_descriptor",
         "//test/util:fs_util",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/synchronization",
-        gtest,
         "//test/util:posix_error",
         "//test/util:temp_path",
         "//test/util:test_main",
         "//test/util:test_util",
         "//test/util:thread_util",
-    ],
+        "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/synchronization",
+    ] + select_gtest(),
 )
 
 cc_binary(
@@ -641,8 +640,6 @@ cc_binary(
         "//test/util:epoll_util",
         "//test/util:eventfd_util",
         "//test/util:file_descriptor",
-        "@com_google_absl//absl/synchronization",
-        gtest,
         "//test/util:posix_error",
         "//test/util:signal_util",
         "//test/util:socket_util",
@@ -650,7 +647,8 @@ cc_binary(
         "//test/util:test_main",
         "//test/util:test_util",
         "//test/util:thread_util",
-    ],
+        "@com_google_absl//absl/synchronization",
+    ] + select_gtest(),
 )
 
 cc_binary(
diff --git a/tools/bazeldefs/cc.bzl b/tools/bazeldefs/cc.bzl
index d13ede510..49a0fc5a1 100644
--- a/tools/bazeldefs/cc.bzl
+++ b/tools/bazeldefs/cc.bzl
@@ -55,3 +55,6 @@ def cc_binary(name, static = False, tcmalloc = False, **kwargs):
         name = name,
         **kwargs
     )
+
+def select_gtest():
+    return [gtest]  # No select is needed.
diff --git a/tools/defs.bzl b/tools/defs.bzl
index 2dc6bb5bd..5bdb2669d 100644
--- a/tools/defs.bzl
+++ b/tools/defs.bzl
@@ -5,15 +5,15 @@ automagically creating cc_ and go_ proto targets) and act as a single point of
 change for Google-internal and bazel-compatible rules.
 """
 
-load("//tools/go_stateify:defs.bzl", "go_stateify")
 load("//tools/go_marshal:defs.bzl", "go_marshal", "marshal_deps", "marshal_test_deps")
-load("//tools/nogo:defs.bzl", "nogo_test")
+load("//tools/go_stateify:defs.bzl", "go_stateify")
+load("//tools/bazeldefs:cc.bzl", _cc_binary = "cc_binary", _cc_flags_supplier = "cc_flags_supplier", _cc_grpc_library = "cc_grpc_library", _cc_library = "cc_library", _cc_proto_library = "cc_proto_library", _cc_test = "cc_test", _cc_toolchain = "cc_toolchain", _gbenchmark = "gbenchmark", _gbenchmark_internal = "gbenchmark_internal", _grpcpp = "grpcpp", _gtest = "gtest", _select_gtest = "select_gtest", _vdso_linker_option = "vdso_linker_option")
 load("//tools/bazeldefs:defs.bzl", _BuildSettingInfo = "BuildSettingInfo", _bool_flag = "bool_flag", _bpf_program = "bpf_program", _build_test = "build_test", _bzl_library = "bzl_library", _coreutil = "coreutil", _default_net_util = "default_net_util", _more_shards = "more_shards", _most_shards = "most_shards", _proto_library = "proto_library", _select_system = "select_system", _short_path = "short_path", _version = "version")
-load("//tools/bazeldefs:cc.bzl", _cc_binary = "cc_binary", _cc_flags_supplier = "cc_flags_supplier", _cc_grpc_library = "cc_grpc_library", _cc_library = "cc_library", _cc_proto_library = "cc_proto_library", _cc_test = "cc_test", _cc_toolchain = "cc_toolchain", _gbenchmark = "gbenchmark", _gbenchmark_internal = "gbenchmark_internal", _grpcpp = "grpcpp", _gtest = "gtest", _vdso_linker_option = "vdso_linker_option")
 load("//tools/bazeldefs:go.bzl", _gazelle = "gazelle", _go_binary = "go_binary", _go_grpc_and_proto_libraries = "go_grpc_and_proto_libraries", _go_library = "go_library", _go_path = "go_path", _go_proto_library = "go_proto_library", _go_test = "go_test", _gotsan_flag_values = "gotsan_flag_values", _gotsan_values = "gotsan_values", _select_goarch = "select_goarch", _select_goos = "select_goos")
 load("//tools/bazeldefs:pkg.bzl", _pkg_deb = "pkg_deb", _pkg_tar = "pkg_tar")
 load("//tools/bazeldefs:platforms.bzl", _default_platform = "default_platform", _platform_capabilities = "platform_capabilities", _platforms = "platforms")
 load("//tools/bazeldefs:tags.bzl", "go_suffixes")
+load("//tools/nogo:defs.bzl", "nogo_test")
 
 # Core rules.
 build_test = _build_test
@@ -40,6 +40,7 @@ gbenchmark_internal = _gbenchmark_internal
 gtest = _gtest
 grpcpp = _grpcpp
 vdso_linker_option = _vdso_linker_option
+select_gtest = _select_gtest
 
 # Go rules.
 gazelle = _gazelle