6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-24 08:24:33 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Add a missing reference on a std::vector<> out param"

Browse Source 
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
This commit is contained in:
Michael Gottesman
2013-04-22 22:51:55 +00:00
parent 9a0e12a6ed
commit 2c8dc64357
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
unittests/Support/ProgramTest.cpp
View File

@ -24,15 +24,6 @@ ProgramTestStringArg1("program-test-string-arg1");
static cl::opt<std::string> static cl::opt<std::string>
ProgramTestStringArg2("program-test-string-arg2"); 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) { TEST(ProgramTest, CreateProcessTrailingSlash) {
if (getenv("LLVM_PROGRAM_TEST_CHILD")) { if (getenv("LLVM_PROGRAM_TEST_CHILD")) {
if (ProgramTestStringArg1 == "has\\\\ trailing\\" && if (ProgramTestStringArg1 == "has\\\\ trailing\\" &&
@ -52,13 +43,7 @@ TEST(ProgramTest, CreateProcessTrailingSlash) {
"-program-test-string-arg2", "has\\\\ trailing\\", "-program-test-string-arg2", "has\\\\ trailing\\",
0 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; std::string error;
bool ExecutionFailed; bool ExecutionFailed;
// Redirect stdout and stdin to NUL, but let stderr through. // Redirect stdout and stdin to NUL, but let stderr through.
@ -68,7 +53,7 @@ TEST(ProgramTest, CreateProcessTrailingSlash) {
Path nul("/dev/null"); Path nul("/dev/null");
#endif #endif
const Path *redirects[] = { &nul, &nul, 0 }; 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, /*secondsToWait=*/10, /*memoryLimit=*/0,
&error, &ExecutionFailed); &error, &ExecutionFailed);
EXPECT_FALSE(ExecutionFailed) << error; EXPECT_FALSE(ExecutionFailed) << error;