[Support] Propagate the environment into the test child process

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180041 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/unittests/Support/ProgramTest.cpp b/unittests/Support/ProgramTest.cpp
index 03083aa68bf95951ad34f7831c47b15e9e8f8322..479b6b57ec236416f97ad805f77ede8d7c4e1f0b 100755 (executable)
--- a/unittests/Support/ProgramTest.cpp
+++ b/unittests/Support/ProgramTest.cpp
@@ -24,6 +24,15 @@ ProgramTestStringArg1("program-test-string-arg1");
 static cl::opt<std::string>
 ProgramTestStringArg2("program-test-string-arg2");
 
 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\\" &&
 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
   };
     "-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.
   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 };
   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;
                                    /*secondsToWait=*/10, /*memoryLimit=*/0,
                                    &error, &ExecutionFailed);
   EXPECT_FALSE(ExecutionFailed) << error;