From 947464d1795a5258d061abf21610034cac8d29ff Mon Sep 17 00:00:00 2001 From: Pawel Bylica <chfast@gmail.com> Date: Fri, 16 Oct 2015 10:11:07 +0000 Subject: [PATCH] Fix path::home_directory() unit test. It turns out that constructing std::string from null pointer is not the very best idea. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250506 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Support/Path.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp index 044e80fe363..992bba6bcd1 100644 --- a/unittests/Support/Path.cpp +++ b/unittests/Support/Path.cpp @@ -302,18 +302,22 @@ TEST(Support, AbsolutePathIteratorEnd) { TEST(Support, HomeDirectory) { std::string expected; #ifdef LLVM_ON_WIN32 - wchar_t *path = ::_wgetenv(L"USERPROFILE"); - auto pathLen = ::wcslen(path); - ArrayRef<char> ref{reinterpret_cast<char *>(path), pathLen * sizeof(wchar_t)}; - convertUTF16ToUTF8String(ref, expected); + if (wchar_t const *path = ::_wgetenv(L"USERPROFILE")) { + auto pathLen = ::wcslen(path); + ArrayRef<char> ref{reinterpret_cast<char const *>(path), + pathLen * sizeof(wchar_t)}; + convertUTF16ToUTF8String(ref, expected); + } #else - if (char const *home = ::getenv("HOME")) - expected = home; + if (char const *path = ::getenv("HOME")) + expected = path; #endif - if (expected.length() > 0) { + // Do not try to test it if we don't know what to expect. + // On Windows we use something better than env vars. + if (!expected.empty()) { SmallString<128> HomeDir; auto status = path::home_directory(HomeDir); - EXPECT_TRUE(status ^ HomeDir.empty()); + EXPECT_TRUE(status); EXPECT_EQ(expected, HomeDir); } } -- 2.34.1