Skip to content

Enable propagating env vars to binaries started by Centipede. #2026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enable propagating env vars to binaries started by Centipede. #2026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions centipede/centipede_callbacks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,8 @@ CentipedeCallbacks::GetOrCreateCommandContextForBinary(
std::make_unique<CentipedeCallbacks::PersistentModeServer>(
std::move(server_path));
}
std::vector<std::string> env = {ConstructRunnerFlags(
std::vector<std::string> env = env_.env_for_binaries;
env.push_back(ConstructRunnerFlags(
absl::StrCat(":shmem:test=", env_.test_name, ":arg1=",
inputs_blobseq_.path(), ":arg2=", outputs_blobseq_.path(),
":failure_description_path=", failure_description_path_,
Expand All @@ -425,12 +426,13 @@ CentipedeCallbacks::GetOrCreateCommandContextForBinary(
: absl::StrCat(":persistent_mode_socket=",
persistent_mode_server->server_path()),
":"),
disable_coverage)};
disable_coverage));

if (env_.clang_coverage_binary == binary)
env.emplace_back(
if (env_.clang_coverage_binary == binary) {
env.push_back(
absl::StrCat("LLVM_PROFILE_FILE=",
WorkDir{env_}.SourceBasedCoverageRawProfilePath()));
}

Command::Options cmd_options;
cmd_options.env_add = std::move(env);
Expand Down Expand Up @@ -642,7 +644,8 @@ bool CentipedeCallbacks::GetSeedsViaExternalBinary(
"dl_path_suffix=", env_.runner_dl_path_suffix, ":");
}
Command::Options cmd_options;
cmd_options.env_add = {std::move(centipede_runner_flags)};
cmd_options.env_add = env_.env_for_binaries;
cmd_options.env_add.push_back(std::move(centipede_runner_flags));
cmd_options.env_remove = EnvironmentVariablesToUnset();
cmd_options.stdout_file_prefix = execute_log_prefix_;
cmd_options.stderr_file_prefix = execute_log_prefix_;
Expand Down Expand Up @@ -707,7 +710,8 @@ bool CentipedeCallbacks::GetSerializedTargetConfigViaExternalBinary(
"dl_path_suffix=", env_.runner_dl_path_suffix, ":");
}
Command::Options cmd_options;
cmd_options.env_add = {std::move(centipede_runner_flags)};
cmd_options.env_add = env_.env_for_binaries;
cmd_options.env_add.push_back(std::move(centipede_runner_flags));
cmd_options.env_remove = EnvironmentVariablesToUnset();
cmd_options.stdout_file_prefix = execute_log_prefix_;
cmd_options.stderr_file_prefix = execute_log_prefix_;
Expand Down
8 changes: 8 additions & 0 deletions centipede/centipede_flags.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,3 +484,11 @@ CENTIPEDE_FLAG(
bool, report_crash_summary, true,
"If set, reports a summary of crashes found during fuzzing or replay."
)
CENTIPEDE_FLAG(
std::vector<std::string>, env_for_binaries, {},
"A comma-separated list of environment variables (KEY=VALUE) to pass to the "
"target binary, coverage binary, and extra binaries. By default, these "
"binaries inherit the parent process's environment, except for certain "
"test-related variables (e.g., Bazel's TEST_*) that are explicitly unset "
"to avoid interference."
)
Loading