From 13acd27f18a62dc5e328183d9e4fdba50ecd73cc Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Sun, 26 Jan 2025 19:54:02 -0800
Subject: [PATCH] x

---
 test/core/end2end/grpc_core_end2end_test.bzl | 29 ++++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/test/core/end2end/grpc_core_end2end_test.bzl b/test/core/end2end/grpc_core_end2end_test.bzl
index 1b7fa4dcd45d2..73d6b5e9aee96 100644
--- a/test/core/end2end/grpc_core_end2end_test.bzl
+++ b/test/core/end2end/grpc_core_end2end_test.bzl
@@ -16,7 +16,7 @@
 Generate one e2e test & associated fuzzer
 """
 
-load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_fuzz_test")
+load("//bazel:grpc_build_system.bzl", "grpc_cc_test")
 
 END2END_TEST_DATA = [
     "//src/core/tsi/test_creds:ca.pem",
@@ -24,6 +24,14 @@ END2END_TEST_DATA = [
     "//src/core/tsi/test_creds:server1.pem",
 ]
 
+def if_fuzztest_supported(true_value, false_value):
+    return select({
+        "//:windows": false_value,
+        "//:windows_msvc": false_value,
+        "//:windows_clang": false_value,
+        "//conditions:default": true_value,
+    })
+
 def grpc_core_end2end_test(name, shard_count = 10, enable_fuzzing = True, tags = [], flaky = False):
     """Generate one core end2end test
 
@@ -37,7 +45,7 @@ def grpc_core_end2end_test(name, shard_count = 10, enable_fuzzing = True, tags =
     if len(name) > 60:
         fail("test name %s too long" % name)
 
-    grpc_fuzz_test(
+    grpc_cc_test(
         name = name + "_test",
         srcs = [
             "tests/%s.cc" % name,
@@ -45,12 +53,18 @@ def grpc_core_end2end_test(name, shard_count = 10, enable_fuzzing = True, tags =
         external_deps = [
             "absl/log:log",
             "gtest",
-            "fuzztest",
-            "fuzztest_main",
         ],
         data = END2END_TEST_DATA,
         shard_count = shard_count,
-        defines = [] if enable_fuzzing else ["GRPC_END2END_TEST_NO_FUZZER"],
+        defines = if_fuzztest_supported(
+            [] if enable_fuzzing else ["GRPC_END2END_TEST_NO_FUZZER"],
+            [],
+        ),
+        tags = tags + [
+            "grpc-fuzzer",
+            "grpc-fuzztest",
+            "bazel_only",
+        ],
         deps = [
             "cq_verifier",
             "end2end_test_lib",
@@ -95,5 +109,8 @@ def grpc_core_end2end_test(name, shard_count = 10, enable_fuzzing = True, tags =
             "//test/core/test_util:fake_stats_plugin",
             "//test/core/test_util:grpc_test_util",
             "//test/core/test_util:test_lb_policies",
-        ],
+        ] + if_fuzztest_supported(
+            ["//third_party:fuzztest", "//third_party:fuzztest_main"],
+            [],
+        ),
     )