Skip to content

Commit b667596

Browse files
committed
Fix test on Windows
1 parent 6b36693 commit b667596

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

llvm/unittests/Support/Path.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,21 +1296,23 @@ TEST_F(FileSystemTest, UTF8ToUTF16DirectoryIteration) {
12961296
}
12971297
#endif
12981298

1299-
#ifndef _WIN32
13001299
TEST_F(FileSystemTest, OpenDirectoryAsFileForRead) {
13011300
ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory)));
13021301
ASSERT_EQ(fs::create_directory(Twine(TestDirectory), false),
13031302
errc::file_exists);
13041303

13051304
std::string Buf(5, '?');
13061305
Expected<fs::file_t> FD = fs::openNativeFileForRead(TestDirectory);
1307-
ASSERT_NO_ERROR(errorToErrorCode(FD.takeError()));
1306+
#ifdef _WIN32
1307+
ASSERT_EQ(errorToErrorCode(BytesRead.takeError()), errc::is_a_directory);
1308+
#else
1309+
ASSERT_THAT_EXPECTED(FD, Succeeded());
13081310
auto Close = make_scope_exit([&] { fs::closeFile(*FD); });
13091311
Expected<size_t> BytesRead =
13101312
fs::readNativeFile(*FD, MutableArrayRef(&*Buf.begin(), Buf.size()));
13111313
ASSERT_EQ(errorToErrorCode(BytesRead.takeError()), errc::is_a_directory);
1312-
}
13131314
#endif
1315+
}
13141316

13151317
TEST_F(FileSystemTest, OpenDirectoryAsFileForWrite) {
13161318
ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory)));
@@ -1320,10 +1322,11 @@ TEST_F(FileSystemTest, OpenDirectoryAsFileForWrite) {
13201322
int FD;
13211323
std::error_code EC;
13221324
EC = fs::openFileForWrite(Twine(TestDirectory), FD);
1325+
if (!EC)
1326+
::close(FD);
13231327
ASSERT_EQ(EC, errc::is_a_directory);
13241328

13251329
ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory)));
1326-
::close(FD);
13271330
}
13281331

13291332
TEST_F(FileSystemTest, Remove) {

0 commit comments

Comments
 (0)