mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-15 12:35:11 +00:00
rebase of the patches
This commit is contained in:
parent
78ad4bde7d
commit
6822fd8ea8
22
debian/patches/disable-path-test-failing.diff
vendored
22
debian/patches/disable-path-test-failing.diff
vendored
@ -1,8 +1,8 @@
|
|||||||
Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/unittests/Support/Path.cpp
|
Index: llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/Support/Path.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/llvm/unittests/Support/Path.cpp
|
--- llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c.orig/llvm/unittests/Support/Path.cpp
|
||||||
+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/unittests/Support/Path.cpp
|
+++ llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/Support/Path.cpp
|
||||||
@@ -448,7 +448,7 @@ protected:
|
@@ -677,7 +677,7 @@ protected:
|
||||||
sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
|
sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -11,19 +11,21 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/unittests/Su
|
|||||||
};
|
};
|
||||||
|
|
||||||
TEST_F(FileSystemTest, Unique) {
|
TEST_F(FileSystemTest, Unique) {
|
||||||
@@ -530,13 +530,13 @@ TEST_F(FileSystemTest, RealPath) {
|
@@ -761,7 +761,8 @@ TEST_F(FileSystemTest, RealPath) {
|
||||||
|
|
||||||
// This can fail if $HOME is not set and getpwuid fails.
|
// This can fail if $HOME is not set and getpwuid fails.
|
||||||
bool Result = llvm::sys::path::home_directory(HomeDir);
|
bool Result = llvm::sys::path::home_directory(HomeDir);
|
||||||
- if (Result) {
|
- if (Result) {
|
||||||
+/* if (Result) {
|
+/*
|
||||||
|
+ if (Result) {
|
||||||
|
checkSeparators(HomeDir);
|
||||||
ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected));
|
ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected));
|
||||||
ASSERT_NO_ERROR(fs::real_path("~", Actual, true));
|
checkSeparators(Expected);
|
||||||
EXPECT_EQ(Expected, Actual);
|
@@ -770,6 +771,7 @@ TEST_F(FileSystemTest, RealPath) {
|
||||||
ASSERT_NO_ERROR(fs::real_path("~/", Actual, true));
|
ASSERT_NO_ERROR(fs::real_path("~/", Actual, true));
|
||||||
EXPECT_EQ(Expected, Actual);
|
EXPECT_EQ(Expected, Actual);
|
||||||
- }
|
}
|
||||||
+ }*/
|
+*/
|
||||||
|
|
||||||
ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) + "/test1"));
|
ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) + "/test1"));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user