Skip to content

Fix the OnDiskCASLoggerTest/MultiProcess test on Windows #11395

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
wants to merge 1 commit into
base: next
Choose a base branch
from
Open

Fix the OnDiskCASLoggerTest/MultiProcess test on Windows #11395

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: 4 additions & 0 deletions llvm/lib/Support/Windows/Program.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,10 @@ static bool Execute(ProcessInfo &PI, StringRef Program,
llvm::append_range(EnvBlock, EnvString);
EnvBlock.push_back(0);
}
// If an empty environment (*Env is size zero), we need to
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a test and create a PR on upstream LLVM.

// terminate with two nulls.
if ((*Env).size() == 0)
EnvBlock.push_back(0);
EnvBlock.push_back(0);
}

Expand Down
5 changes: 0 additions & 5 deletions llvm/unittests/CAS/OnDiskCASLoggerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,7 @@ TEST(OnDiskCASLoggerTest, MultiProcess) {
SmallVector<ProcessInfo> PIs;
for (int I = 0; I < 5; ++I) {
bool ExecutionFailed;
#ifndef _WIN32
auto PI = ExecuteNoWait(Executable, Argv, ArrayRef<StringRef>{}, {}, 0, &Error,
#else
// CreateProcessW will fail with zero-length env on Windows
auto PI = ExecuteNoWait(Executable, Argv, std::nullopt, {}, 0, &Error,
#endif
&ExecutionFailed);
ASSERT_FALSE(ExecutionFailed) << Error;
PIs.push_back(std::move(PI));
Expand Down