Index: llvm-toolchain-snapshot_8~svn347135/unittests/Support/Path.cpp
===================================================================
--- llvm-toolchain-snapshot_8~svn347135.orig/unittests/Support/Path.cpp
+++ llvm-toolchain-snapshot_8~svn347135/unittests/Support/Path.cpp
@@ -437,7 +437,7 @@ protected:
     sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
   }
 
-  void TearDown() override { ASSERT_NO_ERROR(fs::remove(TestDirectory.str())); }
+//  void TearDown() override { ASSERT_NO_ERROR(fs::remove(TestDirectory.str())); }
 };
 
 TEST_F(FileSystemTest, Unique) {
@@ -519,13 +519,13 @@ TEST_F(FileSystemTest, RealPath) {
 
   // This can fail if $HOME is not set and getpwuid fails.
   bool Result = llvm::sys::path::home_directory(HomeDir);
-  if (Result) {
+/*  if (Result) {
     ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected));
     ASSERT_NO_ERROR(fs::real_path("~", Actual, true));
     EXPECT_EQ(Expected, Actual);
     ASSERT_NO_ERROR(fs::real_path("~/", Actual, true));
     EXPECT_EQ(Expected, Actual);
-  }
+    }*/
 
   ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) + "/test1"));
 }