replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Support] Propagate the environment into the test child process 

Should fix the dragonegg bootstrap builder, which reasonably needs
LD_LIBRARY_PATH to be set.

llvm-svn: 180041
This commit is contained in:
Reid Kleckner 2013-04-22 20:23:41 +00:00
parent d8fb032cff
commit 21a8c2f361
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/unittests/Support/ProgramTest.cpp
View File

@ -24,6 +24,15 @@ ProgramTestStringArg1("program-test-string-arg1");
static cl::opt<std::string>
ProgramTestStringArg2("program-test-string-arg2");
static void CopyEnvironment(std::vector<const char *> out) {
// environ appears to be pretty portable.
char **envp = environ;
while (*envp != 0) {
out.push_back(*envp);
++envp;
}
}
TEST(ProgramTest, CreateProcessTrailingSlash) {
if (getenv("LLVM_PROGRAM_TEST_CHILD")) {
if (ProgramTestStringArg1 == "has\\\\ trailing\\" &&
@ -43,7 +52,13 @@ TEST(ProgramTest, CreateProcessTrailingSlash) {
"-program-test-string-arg2", "has\\\\ trailing\\",
0
};
const char *envp[] = { "LLVM_PROGRAM_TEST_CHILD=1", 0 };
// Add LLVM_PROGRAM_TEST_CHILD to the environment of the child.
std::vector<const char *> envp;
CopyEnvironment(envp);
envp.push_back("LLVM_PROGRAM_TEST_CHILD=1");
envp.push_back(0);
std::string error;
bool ExecutionFailed;
// Redirect stdout and stdin to NUL, but let stderr through.
@ -53,7 +68,7 @@ TEST(ProgramTest, CreateProcessTrailingSlash) {
Path nul("/dev/null");
#endif
const Path *redirects[] = { &nul, &nul, 0 };
int rc = Program::ExecuteAndWait(my_exe, argv, envp, redirects,
int rc = Program::ExecuteAndWait(my_exe, argv, &envp[0], redirects,
/*secondsToWait=*/10, /*memoryLimit=*/0,
&error, &ExecutionFailed);
EXPECT_FALSE(ExecutionFailed) << error;