Commit 8ccab3d9 authored by Sylvestre Ledru's avatar Sylvestre Ledru

rebase of the patches

parent 19835997
Index: llvm-toolchain-snapshot_6.0~svn309541/unittests/Support/Path.cpp
Index: llvm-toolchain-snapshot_7~svn334230/unittests/Support/Path.cpp
===================================================================
--- llvm-toolchain-snapshot_6.0~svn309541.orig/unittests/Support/Path.cpp
+++ llvm-toolchain-snapshot_6.0~svn309541/unittests/Support/Path.cpp
@@ -473,7 +473,7 @@ protected:
errs().flush();
--- llvm-toolchain-snapshot_7~svn334230.orig/unittests/Support/Path.cpp
+++ llvm-toolchain-snapshot_7~svn334230/unittests/Support/Path.cpp
@@ -465,7 +465,7 @@ protected:
sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
}
- void TearDown() override { ASSERT_NO_ERROR(fs::remove(TestDirectory.str())); }
......@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_6.0~svn309541/unittests/Support/Path.cpp
};
TEST_F(FileSystemTest, Unique) {
@@ -553,13 +553,13 @@ TEST_F(FileSystemTest, RealPath) {
@@ -545,13 +545,13 @@ TEST_F(FileSystemTest, RealPath) {
SmallString<64> HomeDir;
bool Result = llvm::sys::path::home_directory(HomeDir);
......
Index: llvm-toolchain-snapshot-7~svn330801/lib/Support/Unix/Path.inc
Index: llvm-toolchain-snapshot_7~svn334230/lib/Support/Unix/Path.inc
===================================================================
--- llvm-toolchain-snapshot-7~svn330801.orig/lib/Support/Unix/Path.inc
+++ llvm-toolchain-snapshot-7~svn330801/lib/Support/Unix/Path.inc
@@ -172,7 +172,7 @@ std::string getMainExecutable(const char
--- llvm-toolchain-snapshot_7~svn334230.orig/lib/Support/Unix/Path.inc
+++ llvm-toolchain-snapshot_7~svn334230/lib/Support/Unix/Path.inc
@@ -175,7 +175,7 @@ std::string getMainExecutable(const char
if (getprogpath(exe_path, argv0) != NULL)
return exe_path;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment