@@ -1296,21 +1296,23 @@ TEST_F(FileSystemTest, UTF8ToUTF16DirectoryIteration) {
1296
1296
}
1297
1297
#endif
1298
1298
1299
- #ifndef _WIN32
1300
1299
TEST_F (FileSystemTest, OpenDirectoryAsFileForRead) {
1301
1300
ASSERT_NO_ERROR (fs::create_directory (Twine (TestDirectory)));
1302
1301
ASSERT_EQ (fs::create_directory (Twine (TestDirectory), false ),
1303
1302
errc::file_exists);
1304
1303
1305
1304
std::string Buf (5 , ' ?' );
1306
1305
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 ());
1308
1310
auto Close = make_scope_exit ([&] { fs::closeFile (*FD); });
1309
1311
Expected<size_t > BytesRead =
1310
1312
fs::readNativeFile (*FD, MutableArrayRef (&*Buf.begin (), Buf.size ()));
1311
1313
ASSERT_EQ (errorToErrorCode (BytesRead.takeError ()), errc::is_a_directory);
1312
- }
1313
1314
#endif
1315
+ }
1314
1316
1315
1317
TEST_F (FileSystemTest, OpenDirectoryAsFileForWrite) {
1316
1318
ASSERT_NO_ERROR (fs::create_directory (Twine (TestDirectory)));
@@ -1320,10 +1322,11 @@ TEST_F(FileSystemTest, OpenDirectoryAsFileForWrite) {
1320
1322
int FD;
1321
1323
std::error_code EC;
1322
1324
EC = fs::openFileForWrite (Twine (TestDirectory), FD);
1325
+ if (!EC)
1326
+ ::close (FD);
1323
1327
ASSERT_EQ (EC, errc::is_a_directory);
1324
1328
1325
1329
ASSERT_NO_ERROR (fs::remove_directories (Twine (TestDirectory)));
1326
- ::close (FD);
1327
1330
}
1328
1331
1329
1332
TEST_F (FileSystemTest, Remove) {
0 commit comments