summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-06-20 07:35:24 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-06-20 07:35:24 +0200
commitf4760f02c3ac966f858414fb50565faa5deb48bf (patch)
treea5eb5100ae3e1c88c6cfe8bf6d26e3adad9f1e8e /tests
parent082f8e19b7591f6f8f34edcc27f195510051c2ba (diff)
Disable timeo test on MinGW
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b26cccc..785b7c5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,13 +5,13 @@ noinst_PROGRAMS = test_pair_inproc \
test_pair_tcp \
test_reqrep_inproc \
test_reqrep_tcp \
- test_hwm \
- test_timeo
+ test_hwm
if !ON_MINGW
noinst_PROGRAMS += test_shutdown_stress \
test_pair_ipc \
- test_reqrep_ipc
+ test_reqrep_ipc \
+ test_timeo
endif
test_pair_inproc_SOURCES = test_pair_inproc.cpp testutil.hpp
@@ -22,12 +22,11 @@ test_reqrep_tcp_SOURCES = test_reqrep_tcp.cpp testutil.hpp
test_hwm_SOURCES = test_hwm.cpp
-test_timeo_SOURCES = test_timeo.cpp
-
if !ON_MINGW
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
endif
TESTS = $(noinst_PROGRAMS)