generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 18:40:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1913 from bluca/ipc_windows

Browse Source 
Problem: test_ipc_wildcard is ran on Windows
This commit is contained in:
Hitster GTD 2016-04-21 14:39:13 +01:00
commit 23e42526eb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -382,7 +382,6 @@ test_apps = \
tests/test_getsockopt_memset \ tests/test_getsockopt_memset \
tests/test_setsockopt \ tests/test_setsockopt \
tests/test_many_sockets \ tests/test_many_sockets \
tests/test_ipc_wildcard \
tests/test_diffserv \ tests/test_diffserv \
tests/test_connect_rid \ tests/test_connect_rid \
tests/test_bind_src_address \ 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_SOURCES = tests/test_many_sockets.cpp
tests_test_many_sockets_LDADD = src/libzmq.la 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_SOURCES = tests/test_diffserv.cpp
tests_test_diffserv_LDADD = src/libzmq.la tests_test_diffserv_LDADD = src/libzmq.la
@ -628,6 +624,7 @@ if !ON_MINGW
if !ON_CYGWIN if !ON_CYGWIN
test_apps += \ test_apps += \
tests/test_shutdown_stress \ tests/test_shutdown_stress \
tests/test_ipc_wildcard \
tests/test_pair_ipc \ tests/test_pair_ipc \
tests/test_reqrep_ipc \ tests/test_reqrep_ipc \
tests/test_use_fd_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_SOURCES = tests/test_shutdown_stress.cpp
tests_test_shutdown_stress_LDADD = src/libzmq.la 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_SOURCES = \
tests/test_pair_ipc.cpp \ tests/test_pair_ipc.cpp \
tests/testutil.hpp tests/testutil.hpp

2
tests/CMakeLists.txt
View File

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