maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Un-revert the environ copy in ProgramTest after fixing it on OS X 

This was r180041 and r180046, which was reverted in r180066.
Re-committing this should fix the dragonegg bootstrap, which I presume
needs LD_LIBRARY_PATH to be propagated to the child.

Tested on Linux, Windows, and Mac OS 10.6.

llvm-svn: 180099
This commit is contained in:
Reid Kleckner 2013-04-23 13:15:51 +00:00
parent f36c5a8431
commit de0c26046d
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,12 @@
#include "gtest/gtest.h"
#include <stdlib.h>
#ifdef __APPLE__
# include <crt_externs.h>
#else
// Forward declare environ in case it's not provided by stdlib.h.
extern char **environ;
#endif
namespace {
@ -24,6 +30,21 @@ ProgramTestStringArg1("program-test-string-arg1");
static cl::opt<std::string>
ProgramTestStringArg2("program-test-string-arg2");
static void CopyEnvironment(std::vector<const char *> &out) {
#ifdef __APPLE__
// _NSGetEnviron() only works from the main exe on Mac. Fortunately the test
// should be in the executable.
char **envp = *_NSGetEnviron();
#else
// environ seems to work for Windows and most other Unices.
char **envp = environ;
#endif
while (*envp != 0) {
out.push_back(*envp);
++envp;
}
}
TEST(ProgramTest, CreateProcessTrailingSlash) {
if (getenv("LLVM_PROGRAM_TEST_CHILD")) {
if (ProgramTestStringArg1 == "has\\\\ trailing\\" &&
@ -43,7 +64,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 +80,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;