Skip to content

Always perform exec in command. #2125

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

Merged
copybara-service merged 1 commit into from
Jul 17, 2026
+6 −6
Merged

Always perform exec in command. #2125

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
4 changes: 2 additions & 2 deletions centipede/command.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ std::string Command::ToString() const {
ss.reserve(/*env*/ 1 + options_.env_diff.size() + /*path*/ 1 +
/*args*/ options_.args.size() + /*out/err*/ 2);
// env.
ss.push_back("env");
ss.push_back("exec env");
std::vector<std::string> env_to_set;
env_to_set.reserve(options_.env_diff.size());
// Arguments that unset environment variables must appear first.
Expand Down Expand Up @@ -285,7 +285,7 @@ bool Command::StartForkServer(std::string_view temp_dir_path,
{
CENTIPEDE_FORK_SERVER_FIFO0="%s" \
CENTIPEDE_FORK_SERVER_FIFO1="%s" \
exec %s
%s
} &
printf "%%s" $! > "%s"
)sh";
Expand Down
8 changes: 4 additions & 4 deletions centipede/command_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ namespace {
using ::testing::Optional;

TEST(CommandTest, ToString) {
EXPECT_EQ(Command{"x"}.ToString(), "env \\\nx");
EXPECT_EQ(Command{"x"}.ToString(), "exec env \\\nx");
{
Command::Options cmd_options;
cmd_options.args = {"arg1", "arg2"};
EXPECT_EQ((Command{"path", std::move(cmd_options)}.ToString()),
"env \\\npath \\\narg1 \\\narg2");
"exec env \\\npath \\\narg1 \\\narg2");
}
{
Command::Options cmd_options;
cmd_options.env_diff = {"K1=V1", "K2=V2", "-K3"};
EXPECT_EQ((Command{"x", std::move(cmd_options)}.ToString()),
"env \\\n-u K3 \\\nK1=V1 \\\nK2=V2 \\\nx");
"exec env \\\n-u K3 \\\nK1=V1 \\\nK2=V2 \\\nx");
}
}

Expand Down Expand Up @@ -80,7 +80,7 @@ TEST(CommandTest, InputFileWildCard) {
Command::Options cmd_options;
cmd_options.temp_file_path = "TEMP_FILE";
Command cmd{"foo bar @@ baz", std::move(cmd_options)};
EXPECT_EQ(cmd.ToString(), "env \\\nfoo bar TEMP_FILE baz");
EXPECT_EQ(cmd.ToString(), "exec env \\\nfoo bar TEMP_FILE baz");
}

TEST(CommandTest, ForkServer) {
Expand Down
Loading