shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Fix path::home_directory() unit test.

Browse Source 
It turns out that constructing std::string from null pointer is not the very best idea.

llvm-svn: 250506
This commit is contained in:
Pawel Bylica 2015-10-16 10:11:07 +00:00
parent cc275e428d
commit 2fa025cdcf
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/unittests/Support/Path.cpp
View File

@ -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);
}
}