Skip to content

Commit

Permalink
[fuzzers] Convert memory_quota_fuzzer to fuzztest (grpc#38594)
Browse files Browse the repository at this point in the history
Closes grpc#38594

COPYBARA_INTEGRATE_REVIEW=grpc#38594 from ctiller:rq e5ac14c
PiperOrigin-RevId: 720676020
  • Loading branch information
ctiller authored and copybara-github committed Jan 28, 2025
1 parent 07b6dcc commit 79f2937
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 2,627 deletions.
27 changes: 18 additions & 9 deletions test/core/resource_quota/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package")
load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_fuzz_test", "grpc_proto_fuzzer")
load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_proto_library", "grpc_cc_test", "grpc_internal_proto_library", "grpc_package")
load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_fuzz_test")

licenses(["notice"])

Expand Down Expand Up @@ -133,21 +133,30 @@ grpc_cc_test(
],
)

grpc_proto_fuzzer(
grpc_internal_proto_library(
name = "memory_quota_fuzzer_proto",
srcs = ["memory_quota_fuzzer.proto"],
deps = ["//test/core/test_util:fuzz_config_vars_proto"],
)

grpc_cc_proto_library(
name = "memory_quota_fuzzer_cc_proto",
deps = ["memory_quota_fuzzer_proto"],
)

grpc_fuzz_test(
name = "memory_quota_fuzzer",
srcs = ["memory_quota_fuzzer.cc"],
corpus = "memory_quota_fuzzer_corpus",
external_deps = [
"absl/status",
"absl/strings",
"gtest",
"fuzztest",
"fuzztest_main",
],
proto = "memory_quota_fuzzer.proto",
proto_deps = ["//test/core/test_util:fuzz_config_vars_proto"],
tags = ["no_windows"],
uses_event_engine = False,
uses_polling = False,
deps = [
"call_checker",
"memory_quota_fuzzer_cc_proto",
"//:debug_location",
"//:exec_ctx",
"//:gpr",
Expand Down
26 changes: 11 additions & 15 deletions test/core/resource_quota/memory_quota_fuzzer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
#include "fuzztest/fuzztest.h"
#include "gtest/gtest.h"
#include "src/core/lib/debug/trace.h"
#include "src/core/lib/experiments/config.h"
#include "src/core/lib/iomgr/closure.h"
Expand All @@ -35,15 +37,11 @@
#include "src/core/lib/resource_quota/memory_quota.h"
#include "src/core/util/debug_location.h"
#include "src/core/util/useful.h"
#include "src/libfuzzer/libfuzzer_macro.h"
#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/test_config.h"

bool squelch = true;
bool leak_check = true;

namespace grpc_core {
namespace testing {
namespace {
Expand Down Expand Up @@ -182,17 +180,15 @@ class Fuzzer {
std::map<int, MemoryAllocator::Reservation> allocations_;
};

} // namespace
} // namespace testing
} // namespace grpc_core

DEFINE_PROTO_FUZZER(const memory_quota_fuzzer::Msg& msg) {
if (squelch) {
grpc_disable_all_absl_logs();
}
grpc_core::ApplyFuzzConfigVars(msg.config_vars());
grpc_core::TestOnlyReloadExperimentsFromConfigVariables();
void Fuzz(const memory_quota_fuzzer::Msg& msg) {
ApplyFuzzConfigVars(msg.config_vars());
TestOnlyReloadExperimentsFromConfigVariables();
gpr_log_verbosity_init();
grpc_tracer_init();
grpc_core::testing::Fuzzer().Run(msg);
testing::Fuzzer().Run(msg);
}
FUZZ_TEST(MemoryQuotaFuzzer, Fuzz);

} // namespace
} // namespace testing
} // namespace grpc_core
1 change: 0 additions & 1 deletion test/core/resource_quota/memory_quota_fuzzer_corpus/0

This file was deleted.

32 changes: 0 additions & 32 deletions test/core/resource_quota/memory_quota_fuzzer_corpus/bad-reclaim

This file was deleted.

This file was deleted.

21 changes: 0 additions & 21 deletions test/core/resource_quota/memory_quota_fuzzer_corpus/nullchk

This file was deleted.

Loading

0 comments on commit 79f2937

Please sign in to comment.