From 9ae6227a9794526da9eff22fd8e1f5c4a686b4c6 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Fri, 10 Mar 2017 17:47:13 +0000 Subject: [PATCH] Fix test failure when Home directory cannot be found. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@297484 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Support/Path.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp index 571edaafbb6..c9c98f5d70b 100644 --- a/unittests/Support/Path.cpp +++ b/unittests/Support/Path.cpp @@ -522,15 +522,14 @@ TEST_F(FileSystemTest, RealPath) { EXPECT_EQ(Expected, Actual); SmallString<64> HomeDir; - ASSERT_TRUE(llvm::sys::path::home_directory(HomeDir)); - 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); - - fs::real_path(Twine(TestDirectory) + "/does_not_exist", Actual); - EXPECT_EQ("", Actual); + bool Result = llvm::sys::path::home_directory(HomeDir); + 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")); } -- 2.40.0