[libcxx-commits] [libcxx] fa88f61 - [libcxx] [test] Exclude domain socket tests on windows, like bsd/darwin
Martin Storsjö via libcxx-commits
libcxx-commits at lists.llvm.org
Mon Oct 19 14:07:33 PDT 2020
Author: Martin Storsjö
Date: 2020-10-20T00:07:01+03:00
New Revision: fa88f61ef52fb91b50e2b87aa199c62ebfc2ff3c
URL: https://github.com/llvm/llvm-project/commit/fa88f61ef52fb91b50e2b87aa199c62ebfc2ff3c
DIFF: https://github.com/llvm/llvm-project/commit/fa88f61ef52fb91b50e2b87aa199c62ebfc2ff3c.diff
LOG: [libcxx] [test] Exclude domain socket tests on windows, like bsd/darwin
Differential Revision: https://reviews.llvm.org/D89673
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
libcxx/test/support/filesystem_test_helper.h
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 c17567b348ab..7aece3196d70 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
@@ -115,7 +115,7 @@ TEST_CASE(status_file_types_test)
{static_env.SymlinkToDir, file_type::directory},
// Block files tested elsewhere
{static_env.CharFile, file_type::character},
-#if !defined(__APPLE__) && !defined(__FreeBSD__) // No support for domain sockets
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(_WIN32) // No support for domain sockets
{env.create_socket("socket"), file_type::socket},
#endif
{env.create_fifo("fifo"), file_type::fifo}
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 29cd4637d981..8d320d750bc9 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
@@ -123,7 +123,7 @@ TEST_CASE(symlink_status_file_types_test)
{static_env.SymlinkToDir, file_type::symlink},
// Block files tested elsewhere
{static_env.CharFile, file_type::character},
-#if !defined(__APPLE__) && !defined(__FreeBSD__) // No support for domain sockets
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(_WIN32) // No support for domain sockets
{env.create_socket("socket"), file_type::socket},
#endif
{env.create_fifo("fifo"), file_type::fifo}
diff --git a/libcxx/test/support/filesystem_test_helper.h b/libcxx/test/support/filesystem_test_helper.h
index 448f9851293e..3010b202b2b4 100644
--- a/libcxx/test/support/filesystem_test_helper.h
+++ b/libcxx/test/support/filesystem_test_helper.h
@@ -18,7 +18,7 @@
#include "format_string.h"
// For creating socket files
-#if !defined(__FreeBSD__) && !defined(__APPLE__)
+#if !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(_WIN32)
# include <sys/socket.h>
# include <sys/un.h>
#endif
@@ -156,9 +156,9 @@ struct scoped_test_env
return file;
}
- // OS X and FreeBSD doesn't support socket files so we shouldn't even
+ // Some platforms doesn't support socket files so we shouldn't even
// allow tests to call this unguarded.
-#if !defined(__FreeBSD__) && !defined(__APPLE__)
+#if !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(_WIN32)
std::string create_socket(std::string file) {
file = sanitize_path(std::move(file));
More information about the libcxx-commits
mailing list