x

ctiller · Jan 28, 2025 · 7895632 · 7895632
1 parent 4a7ee68
commit 7895632
Show file tree

Hide file tree

Showing 12 changed files with 273 additions and 332 deletions.
diff --git a/test/core/xds/BUILD b/test/core/xds/BUILD
@@ -16,9 +16,9 @@ load(
     "//bazel:grpc_build_system.bzl",
     "grpc_cc_library",
     "grpc_cc_test",
-    "grpc_package",
+    "grpc_package","grpc_cc_proto_library", "grpc_internal_proto_library"
 )
-load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
+load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_fuzz_test")
 
 grpc_package(name = "test/core/xds")
 
@@ -176,26 +176,37 @@ grpc_cc_test(
     ],
 )
 
-grpc_proto_fuzzer(
-    name = "xds_client_fuzzer",
-    srcs = ["xds_client_fuzzer.cc"],
-    corpus = "xds_client_corpora",
-    external_deps = ["absl/log:log"],
-    proto = "xds_client_fuzzer.proto",
-    proto_deps = [
+grpc_internal_proto_library(
+    name = "xds_client_fuzzer_proto",
+    srcs = [
+        "xds_client_fuzzer.proto"
+    ],
+    deps = [
         "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg",
-    ],
+    ]
+)
+
+grpc_cc_proto_library(
+    name = "xds_client_fuzzer_cc_proto",
+    deps = [
+        "xds_client_fuzzer_proto",
+    ]
+)
+
+grpc_fuzz_test(
+    name = "xds_client_fuzzer",
+    srcs = ["xds_client_fuzzer.cc"],
+    external_deps = ["absl/log:log", "fuzztest", "fuzztest_main", "gtest"],
     tags = ["no_windows"],
-    uses_event_engine = True,
-    uses_polling = False,
     deps = [
         ":xds_client_test_peer",
         ":xds_transport_fake",
         "//src/core:grpc_xds_client",
         "//test/core/test_util:grpc_test_util",
         "//test/core/event_engine/fuzzing_event_engine",
         "//test/core/event_engine:event_engine_test_utils",
+        "xds_client_fuzzer_cc_proto",
         # These proto deps are needed to ensure that we can read these
         # resource types out of the google.protobuf.Any fields in the
         # textproto files in the corpora.
@@ -205,6 +216,7 @@ grpc_proto_fuzzer(
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto",
+        "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
     ],
 )
 

diff --git a/test/core/xds/xds_client_corpora/assert_entry_is_null b/test/core/xds/xds_client_corpora/assert_entry_is_null
diff --git a/test/core/xds/xds_client_corpora/basic_cluster b/test/core/xds/xds_client_corpora/basic_cluster
diff --git a/test/core/xds/xds_client_corpora/basic_endpoint b/test/core/xds/xds_client_corpora/basic_endpoint
diff --git a/test/core/xds/xds_client_corpora/basic_listener b/test/core/xds/xds_client_corpora/basic_listener
diff --git a/test/core/xds/xds_client_corpora/basic_route_config b/test/core/xds/xds_client_corpora/basic_route_config
diff --git a/test/core/xds/xds_client_corpora/bootstrap_xds_servers_empty b/test/core/xds/xds_client_corpora/bootstrap_xds_servers_empty
diff --git a/test/core/xds/xds_client_corpora/fake_transport_trigger_connection_failure b/test/core/xds/xds_client_corpora/fake_transport_trigger_connection_failure
diff --git a/test/core/xds/xds_client_corpora/resource_wrapper_empty b/test/core/xds/xds_client_corpora/resource_wrapper_empty
diff --git a/test/core/xds/xds_client_corpora/rls_missing_typed_extension_config b/test/core/xds/xds_client_corpora/rls_missing_typed_extension_config
diff --git a/test/core/xds/xds_client_corpora/send_message_to_client_before_stream_created b/test/core/xds/xds_client_corpora/send_message_to_client_before_stream_created