Commit 2c786a20 authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #1007 from tSed/sma/fork-fix

Build-system: disable test_fork when fork() is not available
parents 87a08e17 d178c71e
......@@ -717,11 +717,13 @@ if(ZMQ_BUILD_TESTS)
test_monitor
test_pair_ipc
test_reqrep_ipc
test_fork
test_abstract_ipc
test_proxy
test_filter_ipc
)
if(HAVE_FORK)
list(APPEND tests test_fork)
endif()
endif()
foreach(test ${tests})
......
......@@ -544,6 +544,8 @@ LIBZMQ_CHECK_TCP_KEEPALIVE([AC_DEFINE(
[Whether TCP_KEEPALIVE is supported.])
])
AM_CONDITIONAL(HAVE_FORK, test "x$ac_cv_func_fork" = "xyes")
# Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS
AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS)
......
......@@ -56,8 +56,10 @@ noinst_PROGRAMS += test_shutdown_stress \
test_pair_ipc \
test_reqrep_ipc \
test_timeo \
test_fork \
test_filter_ipc
if HAVE_FORK
noinst_PROGRAMS += test_fork
endif
endif
if BUILD_TIPC
......@@ -123,7 +125,9 @@ test_shutdown_stress_SOURCES = test_shutdown_stress.cpp
test_pair_ipc_SOURCES = test_pair_ipc.cpp testutil.hpp
test_reqrep_ipc_SOURCES = test_reqrep_ipc.cpp testutil.hpp
test_timeo_SOURCES = test_timeo.cpp
if HAVE_FORK
test_fork_SOURCES = test_fork.cpp
endif
test_filter_ipc_SOURCES = test_filter_ipc.cpp
endif
if BUILD_TIPC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment