Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion centipede/centipede_flags.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
29 changes: 4 additions & 25 deletions e2e_tests/corpus_database_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ absl::StatusOr<std::string> FindFile(absl::string_view root_path,
enum class ExecutionModelParam {
kTestBinary,
kTestBinaryInvokingCentipedeBinary,
kCentipedeBinary
};

struct UpdateCorpusDatabaseRun {
Expand Down Expand Up @@ -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!";
}
Expand Down Expand Up @@ -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
Loading