x

ctiller · Feb 3, 2025 · 1bfc1b6 · 1bfc1b6
1 parent b64756a
commit 1bfc1b6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/test/core/end2end/end2end_tests.cc b/test/core/end2end/end2end_tests.cc
@@ -20,6 +20,7 @@
 #include <grpc/grpc.h>
 
 #include <memory>
+#include <optional>
 #include <regex>
 #include <tuple>
 
@@ -65,12 +66,13 @@ Slice RandomBinarySlice(size_t length) {
 
 CoreEnd2endTest::CoreEnd2endTest(
     const CoreTestConfiguration* config,
-    const core_end2end_test_fuzzer::Msg* fuzzing_args)
+    const core_end2end_test_fuzzer::Msg* fuzzing_args, absl::string_view suite_name)
     : test_config_(config), fuzzing_(fuzzing_args != nullptr) {
   if (fuzzing_args != nullptr) {
     ConfigVars::Overrides overrides =
         OverridesFromFuzzConfigVars(fuzzing_args->config_vars());
     overrides.default_ssl_roots_file_path = CA_CERT_PATH;
+    if (suite_name == "NoLoggingTests") overrides.trace = std::nullopt;
     ConfigVars::SetOverrides(overrides);
     TestOnlyReloadExperimentsFromConfigVariables();
     FuzzingEventEngine::Options options;

diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h
@@ -172,7 +172,8 @@ inline std::ostream& operator<<(std::ostream& out,
 class CoreEnd2endTest {
  public:
   CoreEnd2endTest(const CoreTestConfiguration* config,
-                  const core_end2end_test_fuzzer::Msg* fuzzing_args);
+                  const core_end2end_test_fuzzer::Msg* fuzzing_args,
+                  absl::string_view suite_name);
   ~CoreEnd2endTest();
 
   void SetCqVerifierStepFn(
@@ -692,13 +693,13 @@ core_end2end_test_fuzzer::Msg ParseTestProto(std::string text);
     defined(GRPC_END2END_TEST_NO_GTEST)
 #define CORE_END2END_TEST_P(suite, name)
 #else
-#define CORE_END2END_TEST_P(suite, name)                             \
-  TEST_P(suite, name) {                                              \
-    if ((GetParam()->feature_mask & FEATURE_MASK_IS_CALL_V3) &&      \
-        (grpc_core::ConfigVars::Get().PollStrategy() == "poll")) {   \
-      GTEST_SKIP() << "call-v3 not supported with poll poller";      \
-    }                                                                \
-    CoreEnd2endTest_##suite##_##name(GetParam(), nullptr).RunTest(); \
+#define CORE_END2END_TEST_P(suite, name)                                     \
+  TEST_P(suite, name) {                                                      \
+    if ((GetParam()->feature_mask & FEATURE_MASK_IS_CALL_V3) &&              \
+        (grpc_core::ConfigVars::Get().PollStrategy() == "poll")) {           \
+      GTEST_SKIP() << "call-v3 not supported with poll poller";              \
+    }                                                                        \
+    CoreEnd2endTest_##suite##_##name(GetParam(), nullptr, #suite).RunTest(); \
   }
 #endif
 
@@ -730,7 +731,7 @@ core_end2end_test_fuzzer::Msg ParseTestProto(std::string text);
       GTEST_SKIP() << "event_engine_dns_non_client_channel experiment breaks " \
                       "fuzzing currently";                                     \
     }                                                                          \
-    CoreEnd2endTest_##suite##_##name(config, &msg).RunTest();                  \
+    CoreEnd2endTest_##suite##_##name(config, &msg, #suite).RunTest();          \
     grpc_event_engine::experimental::ShutdownDefaultEventEngine();             \
   }                                                                            \
   CORE_END2END_TEST_P(suite, name)                                             \