From 5520380790b2edef2abfd10d8ce945f7c6957438 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 30 Jan 2025 11:03:46 -0800 Subject: [PATCH] x --- test/core/call/yodel/BUILD | 1 + test/core/call/yodel/yodel_test.h | 1 + test/core/end2end/BUILD | 4 +- test/core/end2end/end2end_tests.cc | 1 - test/core/end2end/end2end_tests.h | 1 + test/core/end2end/fuzzers/BUILD | 4 ++ test/core/end2end/fuzzers/api_fuzzer.cc | 1 + test/core/end2end/fuzzers/client_fuzzer.cc | 1 + test/core/end2end/fuzzers/server_fuzzer.cc | 1 + .../BUILD | 1 + .../resolver_fuzzer.cc | 1 + test/core/resource_quota/BUILD | 1 + .../resource_quota/memory_quota_fuzzer.cc | 1 + test/core/test_util/BUILD | 1 - test/core/test_util/fuzz_config_vars.h | 8 ++-- .../core/test_util/fuzz_config_vars_helpers.h | 5 +++ test/core/transport/chttp2/BUILD | 3 ++ .../transport/chttp2/flow_control_fuzzer.cc | 1 + .../transport/chttp2/hpack_parser_fuzzer.cc | 1 + .../transport/chttp2/hpack_sync_fuzzer.cc | 1 + tools/codegen/core/gen_config_vars.py | 39 ------------------- 21 files changed, 30 insertions(+), 48 deletions(-) diff --git a/test/core/call/yodel/BUILD b/test/core/call/yodel/BUILD index bb605e4aba861..33e5cee225cb6 100644 --- a/test/core/call/yodel/BUILD +++ b/test/core/call/yodel/BUILD @@ -55,6 +55,7 @@ grpc_cc_library( "//test/core/event_engine/fuzzing_event_engine", "//test/core/test_util:fuzz_config_vars", "//test/core/test_util:grpc_test_util", + "//test/core/test_util:fuzz_config_vars_helpers", "//test/core/test_util:proto_bit_gen", ], ) diff --git a/test/core/call/yodel/yodel_test.h b/test/core/call/yodel/yodel_test.h index 267694407cc45..dccf564cf96d0 100644 --- a/test/core/call/yodel/yodel_test.h +++ b/test/core/call/yodel/yodel_test.h @@ -34,6 +34,7 @@ #include "test/core/call/yodel/fuzzer.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/fuzz_config_vars_helpers.h" #include "test/core/test_util/proto_bit_gen.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index dfc12e171e68f..35bba50b0f299 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -183,9 +183,9 @@ grpc_cc_library( "//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", - ], + "//test/core/test_util:fuzz_config_vars", + ] + (["//test/core/test_util:fuzz_config_vars_helpers"] if fuzz else []), alwayslink = 1, ) for (fuzz, gtest) in [ diff --git a/test/core/end2end/end2end_tests.cc b/test/core/end2end/end2end_tests.cc index 36db6b9f93947..13c45d18f3a40 100644 --- a/test/core/end2end/end2end_tests.cc +++ b/test/core/end2end/end2end_tests.cc @@ -35,7 +35,6 @@ #include "src/core/util/no_destruct.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" -#include "test/core/test_util/fuzz_config_vars.h" using grpc_event_engine::experimental::EventEngine; using grpc_event_engine::experimental::FuzzingEventEngine; diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index b566824c0c80d..966bc76baefe3 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -66,6 +66,7 @@ #ifdef GRPC_END2END_TEST_INCLUDE_FUZZER #include "fuzztest/fuzztest.h" +#include "test/core/test_util/fuzz_config_vars_helpers.h" #endif #define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem" diff --git a/test/core/end2end/fuzzers/BUILD b/test/core/end2end/fuzzers/BUILD index 4c35e258a63a1..bf473ed803185 100644 --- a/test/core/end2end/fuzzers/BUILD +++ b/test/core/end2end/fuzzers/BUILD @@ -74,6 +74,7 @@ grpc_fuzz_test( "//test/core/end2end:ssl_test_data", "//test/core/event_engine/fuzzing_event_engine", "//test/core/test_util:fuzz_config_vars", + "//test/core/test_util:fuzz_config_vars_helpers", "//test/core/test_util:fuzzing_channel_args", "//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util_base", @@ -130,6 +131,7 @@ grpc_fuzz_test( "//src/core:channel_args", "//test/core/event_engine/fuzzing_event_engine", "//test/core/test_util:fuzz_config_vars", + "//test/core/test_util:fuzz_config_vars_helpers", "//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util_base", ], @@ -154,6 +156,7 @@ grpc_fuzz_test( "//src/core:chaotic_good_server", "//test/core/event_engine/fuzzing_event_engine", "//test/core/test_util:fuzz_config_vars", + "//test/core/test_util:fuzz_config_vars_helpers", "//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util_base", ], @@ -177,6 +180,7 @@ grpc_fuzz_test( "//src/core:channel_args", "//test/core/event_engine/fuzzing_event_engine", "//test/core/test_util:fuzz_config_vars", + "//test/core/test_util:fuzz_config_vars_helpers", "//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util_base", ], diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index dd73005b1b0c3..a1fdbf00a2eee 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -65,6 +65,7 @@ #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/fuzz_config_vars_helpers.h" #include "test/core/test_util/fuzzing_channel_args.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index c4d4e80c3fef5..5c5f7a0aebf76 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -41,6 +41,7 @@ #include "test/core/end2end/fuzzers/fuzzing_common.h" #include "test/core/end2end/fuzzers/network_input.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/fuzz_config_vars_helpers.h" #include "test/core/test_util/mock_endpoint.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index d96e9d5180cb1..6d07c5d1bc8ca 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -35,6 +35,7 @@ #include "test/core/end2end/fuzzers/fuzzing_common.h" #include "test/core/end2end/fuzzers/network_input.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/fuzz_config_vars_helpers.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/BUILD b/test/core/ext/filters/event_engine_client_channel_resolver/BUILD index f92969d47368e..84c201a57f25d 100644 --- a/test/core/ext/filters/event_engine_client_channel_resolver/BUILD +++ b/test/core/ext/filters/event_engine_client_channel_resolver/BUILD @@ -54,6 +54,7 @@ grpc_fuzz_test( "//test/core/event_engine:aborting_event_engine", "//test/core/event_engine/fuzzing_event_engine", "//test/core/test_util:fuzz_config_vars", + "//test/core/test_util:fuzz_config_vars_helpers", "//test/core/test_util:fuzzing_channel_args", "//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util_base", diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc index c9ec38cc1e6be..c639b59faef9d 100644 --- a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc +++ b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc @@ -45,6 +45,7 @@ #include "test/core/event_engine/util/aborting_event_engine.h" #include "test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.pb.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/fuzz_config_vars_helpers.h" #include "test/core/test_util/fuzzing_channel_args.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/resource_quota/BUILD b/test/core/resource_quota/BUILD index 912ab2cbccf5c..c37387846f561 100644 --- a/test/core/resource_quota/BUILD +++ b/test/core/resource_quota/BUILD @@ -168,6 +168,7 @@ grpc_fuzz_test( "//src/core:memory_quota", "//src/core:useful", "//test/core/test_util:fuzz_config_vars", + "//test/core/test_util:fuzz_config_vars_helpers", "//test/core/test_util:grpc_test_util", ], ) diff --git a/test/core/resource_quota/memory_quota_fuzzer.cc b/test/core/resource_quota/memory_quota_fuzzer.cc index 8fd6c3782e3f6..93bd2215dfa0c 100644 --- a/test/core/resource_quota/memory_quota_fuzzer.cc +++ b/test/core/resource_quota/memory_quota_fuzzer.cc @@ -40,6 +40,7 @@ #include "test/core/resource_quota/call_checker.h" #include "test/core/resource_quota/memory_quota_fuzzer.pb.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/fuzz_config_vars_helpers.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/test_util/BUILD b/test/core/test_util/BUILD index 39a59d52f9e80..68466953ce96f 100644 --- a/test/core/test_util/BUILD +++ b/test/core/test_util/BUILD @@ -453,7 +453,6 @@ grpc_cc_library( ], deps = [ "fuzz_config_vars_cc_proto", - "fuzz_config_vars_helpers", "//:config_vars", "//:gpr_platform", ], diff --git a/test/core/test_util/fuzz_config_vars.h b/test/core/test_util/fuzz_config_vars.h index 721f3d0178bda..29dd3dcb644ff 100644 --- a/test/core/test_util/fuzz_config_vars.h +++ b/test/core/test_util/fuzz_config_vars.h @@ -12,18 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -// -// Automatically generated by tools/codegen/core/gen_config_vars.py -// - #ifndef GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_H #define GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_H +// See fuzz_config_vars_helpers.h for a fuzztest domain that quickly +// finds interesting and legal configs. + #include #include "src/core/config/config_vars.h" #include "test/core/test_util/fuzz_config_vars.pb.h" -#include "test/core/test_util/fuzz_config_vars_helpers.h" namespace grpc_core { diff --git a/test/core/test_util/fuzz_config_vars_helpers.h b/test/core/test_util/fuzz_config_vars_helpers.h index 1c09a2696f47f..365006fdc0c21 100644 --- a/test/core/test_util/fuzz_config_vars_helpers.h +++ b/test/core/test_util/fuzz_config_vars_helpers.h @@ -15,6 +15,11 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_HELPERS_H #define GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_HELPERS_H +// We can't currently compile fuzztest for Windows, so we separate +// this code from the code to read the protobufs - allowing the latter +// to also be used in regression tests that do run on Windows, and +// reserving this code only for the actual fuzzers. + #include #include diff --git a/test/core/transport/chttp2/BUILD b/test/core/transport/chttp2/BUILD index 094368012c186..90688b63cc0bf 100644 --- a/test/core/transport/chttp2/BUILD +++ b/test/core/transport/chttp2/BUILD @@ -44,6 +44,7 @@ grpc_fuzz_test( "hpack_parser_fuzzer_cc_proto", "//:grpc", "//test/core/test_util:fuzz_config_vars", + "//test/core/test_util:fuzz_config_vars_helpers", "//test/core/test_util:grpc_test_util", "//test/core/test_util:proto_bit_gen", ], @@ -73,6 +74,7 @@ grpc_fuzz_test( "hpack_sync_fuzzer_cc_proto", "//:grpc", "//test/core/test_util:fuzz_config_vars", + "//test/core/test_util:fuzz_config_vars_helpers", "//test/core/test_util:grpc_test_util", "//test/core/test_util:proto_bit_gen", ], @@ -103,6 +105,7 @@ grpc_fuzz_test( "//:gpr", "//src/core:chttp2_flow_control", "//test/core/test_util:fuzz_config_vars", + "//test/core/test_util:fuzz_config_vars_helpers", ], ) diff --git a/test/core/transport/chttp2/flow_control_fuzzer.cc b/test/core/transport/chttp2/flow_control_fuzzer.cc index 919c6752fb789..9054a7886cddb 100644 --- a/test/core/transport/chttp2/flow_control_fuzzer.cc +++ b/test/core/transport/chttp2/flow_control_fuzzer.cc @@ -41,6 +41,7 @@ #include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/fuzz_config_vars_helpers.h" #include "test/core/transport/chttp2/flow_control_fuzzer.pb.h" // IWYU pragma: no_include diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer.cc b/test/core/transport/chttp2/hpack_parser_fuzzer.cc index ff3314a6c7f62..03ba5e910926e 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer.cc @@ -40,6 +40,7 @@ #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/status_helper.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/fuzz_config_vars_helpers.h" #include "test/core/test_util/proto_bit_gen.h" #include "test/core/test_util/test_config.h" #include "test/core/transport/chttp2/hpack_parser_fuzzer.pb.h" diff --git a/test/core/transport/chttp2/hpack_sync_fuzzer.cc b/test/core/transport/chttp2/hpack_sync_fuzzer.cc index 5bc54d4d38f3b..a4305d7407ee4 100644 --- a/test/core/transport/chttp2/hpack_sync_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_sync_fuzzer.cc @@ -44,6 +44,7 @@ #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/status_helper.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/fuzz_config_vars_helpers.h" #include "test/core/test_util/proto_bit_gen.h" #include "test/core/test_util/test_config.h" #include "test/core/transport/chttp2/hpack_sync_fuzzer.pb.h" diff --git a/tools/codegen/core/gen_config_vars.py b/tools/codegen/core/gen_config_vars.py index e3779f554ddbc..d0ab7c1a54c1a 100755 --- a/tools/codegen/core/gen_config_vars.py +++ b/tools/codegen/core/gen_config_vars.py @@ -209,45 +209,6 @@ def string_default_value(x, name): ) print("};", file=P) -with open("test/core/test_util/fuzz_config_vars.h", "w") as H: - put_copyright(H) - - put_banner( - [H], - [ - "", - "Automatically generated by tools/codegen/core/gen_config_vars.py", - "", - ], - ) - - print("#ifndef GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_H", file=H) - print("#define GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_H", file=H) - print(file=H) - print("#include ", file=H) - print(file=H) - print('#include "test/core/test_util/fuzz_config_vars.pb.h"', file=H) - print('#include "src/core/config/config_vars.h"', file=H) - print('#include "test/core/test_util/fuzz_config_vars_helpers.h"', file=H) - print(file=H) - print("namespace grpc_core {", file=H) - print(file=H) - print( - ( - "ConfigVars::Overrides OverridesFromFuzzConfigVars(const" - " grpc::testing::FuzzConfigVars& vars);" - ), - file=H, - ) - print( - "void ApplyFuzzConfigVars(const grpc::testing::FuzzConfigVars& vars);", - file=H, - ) - print(file=H) - print("} // namespace grpc_core", file=H) - print(file=H) - print("#endif // GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_H", file=H) - with open("test/core/test_util/fuzz_config_vars.cc", "w") as C: put_copyright(C)