From 7bd4f25a8a9391f0bff3aa142f6f97c21c4027bd Mon Sep 17 00:00:00 2001
From: Xinhao Yuan <xinhaoyuan@google.com>
Date: Thu, 28 May 2026 13:39:29 -0700
Subject: [PATCH] Disable running multiple fuzz tests by default and remove the
 tests.

PiperOrigin-RevId: 922950326
---
 centipede/centipede_flags.inc     |  2 +-
 e2e_tests/corpus_database_test.cc | 29 ++++-------------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/centipede/centipede_flags.inc b/centipede/centipede_flags.inc
index 843e298e0..13c99be97 100644
--- a/centipede/centipede_flags.inc
+++ b/centipede/centipede_flags.inc
@@ -448,7 +448,7 @@ CENTIPEDE_FLAG(bool, load_shards_only, false,
                "If set, load/merge shards without fuzzing new inputs. For "
                "FuzzTest framework only, do not use from end-users.")
 CENTIPEDE_FLAG(
-    bool, fuzztest_multi_test_mode_soon_to_be_removed, true,
+    bool, fuzztest_multi_test_mode_soon_to_be_removed, false,
     "If set, operate on multiple fuzz tests queried from the binary if it is "
     "using FuzzTest. This mode is going to be removed soon, and Centipede will "
     "operate on only one fuzz test per invocation after that.")
diff --git a/e2e_tests/corpus_database_test.cc b/e2e_tests/corpus_database_test.cc
index 5a1418466..4ce64b915 100644
--- a/e2e_tests/corpus_database_test.cc
+++ b/e2e_tests/corpus_database_test.cc
@@ -65,7 +65,6 @@ absl::StatusOr<std::string> FindFile(absl::string_view root_path,
 enum class ExecutionModelParam {
   kTestBinary,
   kTestBinaryInvokingCentipedeBinary,
-  kCentipedeBinary
 };
 
 struct UpdateCorpusDatabaseRun {
@@ -132,27 +131,6 @@ class UpdateCorpusDatabaseTest
             ShellEscape(CentipedePath());
         return RunBinary(binary_path, centipede_options);
       }
-      case ExecutionModelParam::kCentipedeBinary: {
-        RunOptions centipede_options;
-        centipede_options.env = options.env;
-        centipede_options.timeout = options.timeout;
-        std::vector<std::string> binary_args;
-        binary_args.push_back(std::string(binary_path));
-        for (const auto &[key, value] : options.fuzztest_flags) {
-          binary_args.push_back(CreateFuzzTestFlag(key, value));
-        }
-        for (const auto &[key, value] : options.flags) {
-          binary_args.push_back(absl::StrCat("--", key, "=", value));
-        }
-        centipede_options.flags = {
-            {"binary", absl::StrJoin(binary_args, " ")},
-            // Needed when built without PC tables.
-            {"populate_binary_info", "false"},
-            // Disable symbolization to more quickly get to fuzzing.
-            {"symbolizer_path", ""},
-        };
-        return RunBinary(CentipedePath(), centipede_options);
-      }
     }
     FUZZTEST_LOG(FATAL) << "Unsupported execution model!";
   }
@@ -418,9 +396,10 @@ TEST_P(UpdateCorpusDatabaseTest, PrintsErrorsWhenBazelTimeoutIsNotEnough) {
 
 INSTANTIATE_TEST_SUITE_P(
     UpdateCorpusDatabaseTestWithExecutionModel, UpdateCorpusDatabaseTest,
-    testing::ValuesIn({ExecutionModelParam::kTestBinary,
-                       ExecutionModelParam::kTestBinaryInvokingCentipedeBinary,
-                       ExecutionModelParam::kCentipedeBinary}));
+    testing::ValuesIn({
+        ExecutionModelParam::kTestBinary,
+        ExecutionModelParam::kTestBinaryInvokingCentipedeBinary,
+    }));
 
 }  // namespace
 }  // namespace fuzztest::internal