aboutsummaryrefslogtreecommitdiff
path: root/unittests/Support
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2013-04-22 19:03:55 +0000
committerReid Kleckner <reid@kleckner.net>2013-04-22 19:03:55 +0000
commit0b675d88309bdcbb387bbee907c4ef9d98e412a2 (patch)
treea0cb0b64341e572f825489c0c58d41782ed5d517 /unittests/Support
parent4974b972e7dd94fad74ada4df32a12aba09c4de0 (diff)
[Support] Fix argv string escape bug on Windows
Summary: This is http://llvm.org/PR15802. Backslashes preceding double quotes in arguments must be escaped. The interesting bit is that all other backslashes should *not* be escaped, because the un-escaping logic is only triggered by the presence of a double quote character. Reviewers: Bigcheese CC: llvm-commits Differential Revision: http://llvm-reviews.chandlerc.com/D705 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180035 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Support')
-rw-r--r--unittests/Support/CMakeLists.txt1
-rwxr-xr-xunittests/Support/ProgramTest.cpp63
2 files changed, 64 insertions, 0 deletions
diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt
index b4b982f2ef..a5bf3aef62 100644
--- a/unittests/Support/CMakeLists.txt
+++ b/unittests/Support/CMakeLists.txt
@@ -23,6 +23,7 @@ add_llvm_unittest(SupportTests
MemoryTest.cpp
Path.cpp
ProcessTest.cpp
+ ProgramTest.cpp
RegexTest.cpp
SwapByteOrderTest.cpp
TimeValue.cpp
diff --git a/unittests/Support/ProgramTest.cpp b/unittests/Support/ProgramTest.cpp
new file mode 100755
index 0000000000..03083aa68b
--- /dev/null
+++ b/unittests/Support/ProgramTest.cpp
@@ -0,0 +1,63 @@
+//===- unittest/Support/ProgramTest.cpp -----------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Path.h"
+#include "llvm/Support/Program.h"
+#include "gtest/gtest.h"
+
+#include <stdlib.h>
+
+namespace {
+
+using namespace llvm;
+using namespace sys;
+
+static cl::opt<std::string>
+ProgramTestStringArg1("program-test-string-arg1");
+static cl::opt<std::string>
+ProgramTestStringArg2("program-test-string-arg2");
+
+TEST(ProgramTest, CreateProcessTrailingSlash) {
+ if (getenv("LLVM_PROGRAM_TEST_CHILD")) {
+ if (ProgramTestStringArg1 == "has\\\\ trailing\\" &&
+ ProgramTestStringArg2 == "has\\\\ trailing\\") {
+ exit(0); // Success! The arguments were passed and parsed.
+ }
+ exit(1);
+ }
+
+ // FIXME: Hardcoding argv0 here since I don't know a good cross-platform way
+ // to get it. Maybe ParseCommandLineOptions() should save it?
+ Path my_exe = Path::GetMainExecutable("SupportTests", &ProgramTestStringArg1);
+ const char *argv[] = {
+ my_exe.c_str(),
+ "--gtest_filter=ProgramTest.CreateProcessTrailingSlashChild",
+ "-program-test-string-arg1", "has\\\\ trailing\\",
+ "-program-test-string-arg2", "has\\\\ trailing\\",
+ 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.
+#ifdef LLVM_ON_WIN32
+ Path nul("NUL");
+#else
+ Path nul("/dev/null");
+#endif
+ const Path *redirects[] = { &nul, &nul, 0 };
+ int rc = Program::ExecuteAndWait(my_exe, argv, envp, redirects,
+ /*secondsToWait=*/10, /*memoryLimit=*/0,
+ &error, &ExecutionFailed);
+ EXPECT_FALSE(ExecutionFailed) << error;
+ EXPECT_EQ(0, rc);
+}
+
+} // end anonymous namespace