[libcxx-commits] [libcxx] 3a11a41 - [libcxx] [test] Don't test CharFile (/dev/null) on windows

[Martin Storsjö via libcxx-commits]

Author: Martin Storsjö
Date: 2021-03-07T23:26:41+02:00
New Revision: 3a11a41795bec548e91621caaa4cc00fc31b2212

URL: https://github.com/llvm/llvm-project/commit/3a11a41795bec548e91621caaa4cc00fc31b2212
DIFF: https://github.com/llvm/llvm-project/commit/3a11a41795bec548e91621caaa4cc00fc31b2212.diff

LOG: [libcxx] [test] Don't test CharFile (/dev/null) on windows

Also clarify a nearby comment regarding block devices.

Differential Revision: https://reviews.llvm.org/D98138

Added: 
    

Modified: 
    libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
    libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
index 6abd218e9a20..726e89cbb66e 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
@@ -109,8 +109,10 @@ TEST_CASE(status_file_types_test)
         {static_env.SymlinkToFile, file_type::regular},
         {static_env.Dir, file_type::directory},
         {static_env.SymlinkToDir, file_type::directory},
-        // Block files tested elsewhere
+        // file_type::block files tested elsewhere
+#ifndef _WIN32
         {static_env.CharFile, file_type::character},
+#endif
 #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(_WIN32) // No support for domain sockets
         {env.create_socket("socket"), file_type::socket},
 #endif

diff  --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
index d93e46f750f6..b9c072acdc2e 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
@@ -118,8 +118,10 @@ TEST_CASE(symlink_status_file_types_test)
         {static_env.SymlinkToFile, file_type::symlink},
         {static_env.Dir, file_type::directory},
         {static_env.SymlinkToDir, file_type::symlink},
-        // Block files tested elsewhere
+        // file_type::block files tested elsewhere
+#ifndef _WIN32
         {static_env.CharFile, file_type::character},
+#endif
 #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(_WIN32) // No support for domain sockets
         {env.create_socket("socket"), file_type::socket},
 #endif