[llvm] r180041 - [Support] Propagate the environment into the test child process

[Reid Kleckner]

Thanks, I wasn't around.  I figured anything that Linux and Windows
agreed upon would surely port to Darwin, but I was quite mistaken.
This is why we have libSupport in the first place.  =/

This revert will re-break the builders it was fixing until I come up
with a portable fix.

On Mon, Apr 22, 2013 at 6:54 PM, Michael Gottesman <mgottesman at apple.com> wrote:
> This commit (and its brother) has broken the buildbots for a bit.
>
> See:
> http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-nobootstrap-RAincremental/builds/763
>
> Reverted in r180066.
>
> Michael
>
> On Apr 22, 2013, at 2:59 PM, David Dean <david_dean at apple.com> wrote:
>
> I'm seeing the following build failure on multiple bots:
>
> /Users/buildslave/zorg/buildbot/smooshlab/slave-0.8/build.clang-x86_64-darwin10-nobootstrap-RA/llvm/unittests/Support/ProgramTest.cpp:29:17:
> error: use of undeclared identifier 'environ'
>  char **envp = environ;
>                ^
>
>
> On 22 Apr 2013, at 1:23 PM, Reid Kleckner <reid at kleckner.net> wrote:
>
> Author: rnk
> Date: Mon Apr 22 15:23:41 2013
> New Revision: 180041
>
> URL: http://llvm.org/viewvc/llvm-project?rev=180041&view=rev
> Log:
> [Support] Propagate the environment into the test child process
>
> Should fix the dragonegg bootstrap builder, which reasonably needs
> LD_LIBRARY_PATH to be set.
>
> 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=180041&r1=180040&r2=180041&view=diff
> ==============================================================================
> --- llvm/trunk/unittests/Support/ProgramTest.cpp (original)
> +++ llvm/trunk/unittests/Support/ProgramTest.cpp Mon Apr 22 15:23:41 2013
> @@ -24,6 +24,15 @@ 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\\" &&
> @@ -43,7 +52,13 @@ TEST(ProgramTest, CreateProcessTrailingS
>    "-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, CreateProcessTrailingS
>  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;
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
> -David
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>