Merge pull request #1913 from bluca/ipc_windows

Problem: test_ipc_wildcard is ran on Windows

Makefile.am

@@ -382,7 +382,6 @@ test_apps = \
 	tests/test_getsockopt_memset \
 	tests/test_setsockopt \
 	tests/test_many_sockets \
-	tests/test_ipc_wildcard \
 	tests/test_diffserv \
 	tests/test_connect_rid \
 	tests/test_bind_src_address \
@@ -561,9 +560,6 @@ tests_test_getsockopt_memset_LDADD = src/libzmq.la
 tests_test_many_sockets_SOURCES = tests/test_many_sockets.cpp
 tests_test_many_sockets_LDADD = src/libzmq.la
 
-tests_test_ipc_wildcard_SOURCES = tests/test_ipc_wildcard.cpp
-tests_test_ipc_wildcard_LDADD = src/libzmq.la
-
 tests_test_diffserv_SOURCES = tests/test_diffserv.cpp
 tests_test_diffserv_LDADD = src/libzmq.la
 
@@ -628,6 +624,7 @@ if !ON_MINGW
 if !ON_CYGWIN
 test_apps += \
 	tests/test_shutdown_stress \
+	tests/test_ipc_wildcard \
 	tests/test_pair_ipc \
 	tests/test_reqrep_ipc \
 	tests/test_use_fd_ipc \
@@ -638,6 +635,9 @@ test_apps += \
 tests_test_shutdown_stress_SOURCES = tests/test_shutdown_stress.cpp
 tests_test_shutdown_stress_LDADD = src/libzmq.la
 
+tests_test_ipc_wildcard_SOURCES = tests/test_ipc_wildcard.cpp
+tests_test_ipc_wildcard_LDADD = src/libzmq.la
+
 tests_test_pair_ipc_SOURCES = \
 	tests/test_pair_ipc.cpp \
 	tests/testutil.hpp

tests/CMakeLists.txt

@@ -61,7 +61,6 @@ set(tests
         test_atomics
         test_bind_src_address
         test_capabilities
-        test_ipc_wildcard
         test_metadata
         test_router_handover
         test_srcfd
@@ -76,6 +75,7 @@ set(tests
 if(NOT WIN32)
   list(APPEND tests
           test_monitor
+          test_ipc_wildcard
           test_pair_ipc
           test_reqrep_ipc
           test_proxy