[llvm] r180066 - Revert "Add a missing reference on a std::vector<> out param"

[Michael Gottesman]

Author: mgottesman
Date: Mon Apr 22 17:51:55 2013
New Revision: 180066

URL: http://llvm.org/viewvc/llvm-project?rev=180066&view=rev
Log:
Revert "Add a missing reference on a std::vector<> out param"
Revert "[Support] Propagate the environment into the test child process"

This reverts commit r180046.
This reverts commit r180041.

These have broken buildbots for ~3 hours:

http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-nobootstrap-RAincremental/builds/763

Modified:
    llvm/trunk/unittests/Support/ProgramTest.cpp

Modified: llvm/trunk/unittests/Support/ProgramTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/ProgramTest.cpp?rev=180066&r1=180065&r2=180066&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/ProgramTest.cpp (original)
+++ llvm/trunk/unittests/Support/ProgramTest.cpp Mon Apr 22 17:51:55 2013
@@ -24,15 +24,6 @@ ProgramTestStringArg1("program-test-stri
 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\\" &&
@@ -52,13 +43,7 @@ TEST(ProgramTest, CreateProcessTrailingS
     "-program-test-string-arg2", "has\\\\ trailing\\",
     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);
-
+  const char *envp[] = { "LLVM_PROGRAM_TEST_CHILD=1", 0 };
   std::string error;
   bool ExecutionFailed;
   // Redirect stdout and stdin to NUL, but let stderr through.
@@ -68,7 +53,7 @@ TEST(ProgramTest, CreateProcessTrailingS
   Path nul("/dev/null");
 #endif
   const Path *redirects[] = { &nul, &nul, 0 };
-  int rc = Program::ExecuteAndWait(my_exe, argv, &envp[0], redirects,
+  int rc = Program::ExecuteAndWait(my_exe, argv, envp, redirects,
                                    /*secondsToWait=*/10, /*memoryLimit=*/0,
                                    &error, &ExecutionFailed);
   EXPECT_FALSE(ExecutionFailed) << error;