diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-26 05:01:35 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-26 05:01:35 +0000 |
commit | 50188c1f42c122640ab9ccac2134acf371c26b2c (patch) | |
tree | 05539e5a83063a0eeda3c9211dfb8153cc750f0c /unittests | |
parent | 2c63b27e9f36dddc2660639026b19e606ad52cd0 (diff) | |
download | llvm-50188c1f42c122640ab9ccac2134acf371c26b2c.tar.gz llvm-50188c1f42c122640ab9ccac2134acf371c26b2c.tar.bz2 llvm-50188c1f42c122640ab9ccac2134acf371c26b2c.tar.xz |
Port GetMainExecutable over to PathV2.
I will remove the V1 version as soon as I change clang in the next commit.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184914 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests')
-rw-r--r-- | unittests/Support/ProgramTest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/unittests/Support/ProgramTest.cpp b/unittests/Support/ProgramTest.cpp index 1cf53d50b0..7886761c9a 100644 --- a/unittests/Support/ProgramTest.cpp +++ b/unittests/Support/ProgramTest.cpp @@ -8,6 +8,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/PathV1.h" #include "llvm/Support/Program.h" @@ -56,7 +57,8 @@ TEST(ProgramTest, CreateProcessTrailingSlash) { exit(1); } - Path my_exe = Path::GetMainExecutable(TestMainArgv0, &ProgramTestStringArg1); + std::string my_exe = + sys::fs::getMainExecutable(TestMainArgv0, &ProgramTestStringArg1); const char *argv[] = { my_exe.c_str(), "--gtest_filter=ProgramTest.CreateProcessTrailingSlashChild", @@ -80,7 +82,7 @@ TEST(ProgramTest, CreateProcessTrailingSlash) { StringRef nul("/dev/null"); #endif const StringRef *redirects[] = { &nul, &nul, 0 }; - int rc = ExecuteAndWait(my_exe.str(), argv, &envp[0], redirects, + int rc = ExecuteAndWait(my_exe, argv, &envp[0], redirects, /*secondsToWait=*/ 10, /*memoryLimit=*/ 0, &error, &ExecutionFailed); EXPECT_FALSE(ExecutionFailed) << error; |