x

ctiller · Jan 27, 2025 · b43d659 · b43d659
1 parent 2a31d44
commit b43d659
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 60 deletions.
diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD
@@ -109,62 +109,65 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "end2end_test_lib",
-    testonly = 1,
-    srcs = [
-        "end2end_test_suites.cc",
-        "end2end_tests.cc",
-        "fixtures/local_util.cc",
-    ],
-    hdrs = [
-        "end2end_tests.h",
-        "fixtures/h2_oauth2_common.h",
-        "fixtures/h2_ssl_cred_reload_fixture.h",
-        "fixtures/h2_ssl_tls_common.h",
-        "fixtures/h2_tls_common.h",
-        "fixtures/inproc_fixture.h",
-        "fixtures/local_util.h",
-        "fixtures/secure_fixture.h",
-        "fixtures/sockpair_fixture.h",
-        "tests/cancel_test_helpers.h",
-    ],
-    external_deps = [
-        "absl/functional:any_invocable",
-        "absl/log:check",
-        "absl/log:log",
-        "absl/memory",
-        "absl/meta:type_traits",
-        "absl/random",
-        "absl/strings",
-        "gtest",
-        "fuzztest",
-    ],
-    deps = [
-        "cq_verifier",
-        "end2end_test_fuzzer_cc_proto",
-        "http_proxy",
-        "proxy",
-        "//:config",
-        "//:debug_location",
-        "//:gpr",
-        "//:grpc",
-        "//:grpc_public_hdrs",
-        "//src/core:bitset",
-        "//src/core:channel_args",
-        "//src/core:chaotic_good_connector",
-        "//src/core:chaotic_good_server",
-        "//src/core:default_event_engine",
-        "//src/core:no_destruct",
-        "//src/core:slice",
-        "//src/core:time",
-        "//test/core/call:batch_builder",
-        "//test/core/event_engine:event_engine_test_utils",
-        "//test/core/event_engine/fuzzing_event_engine",
-        "//test/core/test_util:fuzz_config_vars",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
+[
+    grpc_cc_library(
+        name = "end2end_test_lib" + ("_fuzzing" if fuzz else ""),
+        testonly = 1,
+        srcs = [
+            "end2end_test_suites.cc",
+            "end2end_tests.cc",
+            "fixtures/local_util.cc",
+        ],
+        hdrs = [
+            "end2end_tests.h",
+            "fixtures/h2_oauth2_common.h",
+            "fixtures/h2_ssl_cred_reload_fixture.h",
+            "fixtures/h2_ssl_tls_common.h",
+            "fixtures/h2_tls_common.h",
+            "fixtures/inproc_fixture.h",
+            "fixtures/local_util.h",
+            "fixtures/secure_fixture.h",
+            "fixtures/sockpair_fixture.h",
+            "tests/cancel_test_helpers.h",
+        ],
+        external_deps = [
+            "absl/functional:any_invocable",
+            "absl/log:check",
+            "absl/log:log",
+            "absl/memory",
+            "absl/meta:type_traits",
+            "absl/random",
+            "absl/strings",
+            "gtest",
+        ] + (["fuzztest"] if fuzz else []),
+        defines = [] if fuzz else ["GRPC_END2END_TEST_NO_FUZZER"],
+        deps = [
+            "cq_verifier",
+            "end2end_test_fuzzer_cc_proto",
+            "http_proxy",
+            "proxy",
+            "//:config",
+            "//:debug_location",
+            "//:gpr",
+            "//:grpc",
+            "//:grpc_public_hdrs",
+            "//src/core:bitset",
+            "//src/core:channel_args",
+            "//src/core:chaotic_good_connector",
+            "//src/core:chaotic_good_server",
+            "//src/core:default_event_engine",
+            "//src/core:no_destruct",
+            "//src/core:slice",
+            "//src/core:time",
+            "//test/core/call:batch_builder",
+            "//test/core/event_engine:event_engine_test_utils",
+            "//test/core/event_engine/fuzzing_event_engine",
+            "//test/core/test_util:fuzz_config_vars",
+            "//test/core/test_util:grpc_test_util",
+        ],
+    )
+    for fuzz in [False, True]
+]
 
 grpc_core_end2end_test(name = "bad_ping")
 

diff --git a/test/core/end2end/grpc_core_end2end_test.bzl b/test/core/end2end/grpc_core_end2end_test.bzl
@@ -30,7 +30,6 @@ _DATA = [
 
 _DEPS = [
     "cq_verifier",
-    "end2end_test_lib",
     "http_proxy",
     "proxy",
     "//:channel_stack_builder",
@@ -97,10 +96,9 @@ def grpc_core_end2end_test(name, shard_count = 1, enable_fuzzing = True, tags =
             "gtest",
             "gtest_main",
         ],
-        deps = _DEPS,
+        deps = _DEPS + ["end2end_test_lib"],
         data = _DATA,
         shard_count = shard_count,
-        defines = ["GRPC_END2END_TEST_NO_FUZZER"],
         tags = tags,
     )
 
@@ -116,7 +114,7 @@ def grpc_core_end2end_test(name, shard_count = 1, enable_fuzzing = True, tags =
                 "fuzztest",
                 "fuzztest_main",
             ],
-            deps = _DEPS,
+            deps = _DEPS + ["end2end_test_lib_fuzzing"],
             data = _DATA,
             defines = ["GRPC_END2END_TEST_NO_GTEST"],
         )