From 2c8dc64357083e81b36a44698a4bacb229f12317 Mon Sep 17 00:00:00 2001 From: Michael Gottesman Date: Mon, 22 Apr 2013 22:51:55 +0000 Subject: 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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180066 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Support/ProgramTest.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'unittests') diff --git a/unittests/Support/ProgramTest.cpp b/unittests/Support/ProgramTest.cpp index 9dd9ccd11b..03083aa68b 100755 --- a/unittests/Support/ProgramTest.cpp +++ b/unittests/Support/ProgramTest.cpp @@ -24,15 +24,6 @@ ProgramTestStringArg1("program-test-string-arg1"); static cl::opt ProgramTestStringArg2("program-test-string-arg2"); -static void CopyEnvironment(std::vector &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, CreateProcessTrailingSlash) { "-program-test-string-arg2", "has\\\\ trailing\\", 0 }; - - // Add LLVM_PROGRAM_TEST_CHILD to the environment of the child. - std::vector 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, CreateProcessTrailingSlash) { 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; -- cgit v1.2.3