Skip to content

Commit 1bc24ba

Browse files
committed
[net] disable testParallelMergingFile on windows
1 parent fbecc6c commit 1bc24ba

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

net/net/test/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@
55
# For the list of contributors see $ROOTSYS/README/CREDITS.
66

77
ROOT_ADD_GTEST(nettests nettests.cxx LIBRARIES Net)
8-
ROOT_ADD_GTEST(testParallelMergingFile testParallelMergingFile.cxx LIBRARIES Net ROOTNTuple)
8+
9+
if(NOT MSVC)
10+
# This test currently relies on unix sockets and doesn't work as-is on windows.
11+
ROOT_ADD_GTEST(testParallelMergingFile testParallelMergingFile.cxx LIBRARIES Net ROOTNTuple)
12+
endif()

0 commit comments

Comments
 (0)