diff options
| author | Martin Lucina <mato@kotelna.sk> | 2011-05-09 11:20:08 +0200 |
|---|---|---|
| committer | Martin Lucina <martin@lucina.net> | 2012-01-23 08:53:47 +0100 |
| commit | f34d1599a651dd0b8feba2397f87629733988384 (patch) | |
| tree | 07694c4ed96bf7b0ecadebc76d6da3f6c0125219 /tests | |
| parent | 8eea9178e40abf16c0e469465a58fba3beaaf754 (diff) | |
| parent | cbaa7cfa93893876e4fd8794b6ea39f4d245b6b5 (diff) | |
Imported Debian patch 2.1.6-1debian/2.1.6-1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.in | 9 | ||||
| -rw-r--r-- | tests/test_pair_tcp.cpp | 2 | ||||
| -rw-r--r-- | tests/test_reqrep_tcp.cpp | 2 | ||||
| -rw-r--r-- | tests/test_shutdown_stress.cpp | 6 |
4 files changed, 12 insertions, 7 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index 6f62264..0963727 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -213,6 +213,8 @@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ +OpenPGM_CFLAGS = @OpenPGM_CFLAGS@ +OpenPGM_LIBS = @OpenPGM_LIBS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -221,6 +223,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -235,8 +240,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -ac_zmq_have_asciidoc = @ac_zmq_have_asciidoc@ -ac_zmq_have_xmlto = @ac_zmq_have_xmlto@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -265,6 +268,8 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +libzmq_have_asciidoc = @libzmq_have_asciidoc@ +libzmq_have_xmlto = @libzmq_have_xmlto@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ diff --git a/tests/test_pair_tcp.cpp b/tests/test_pair_tcp.cpp index e902f7f..e4e8f28 100644 --- a/tests/test_pair_tcp.cpp +++ b/tests/test_pair_tcp.cpp @@ -25,7 +25,7 @@ using namespace zmqtestutil; int main (int argc, char *argv []) { - const char *transport = "tcp://127.0.0.1:5555" ; + const char *transport = "tcp://127.0.0.1:5560"; basic_tests (transport, ZMQ_PAIR, ZMQ_PAIR); return 0 ; } diff --git a/tests/test_reqrep_tcp.cpp b/tests/test_reqrep_tcp.cpp index 9f1f3e6..b225195 100644 --- a/tests/test_reqrep_tcp.cpp +++ b/tests/test_reqrep_tcp.cpp @@ -25,7 +25,7 @@ using namespace zmqtestutil; int main (int argc, char *argv []) { - const char *transport = "tcp://127.0.0.1:5555" ; + const char *transport = "tcp://127.0.0.1:5560" ; basic_tests (transport, ZMQ_REQ, ZMQ_REP); return 0 ; } diff --git a/tests/test_shutdown_stress.cpp b/tests/test_shutdown_stress.cpp index 85ba912..dccf91f 100644 --- a/tests/test_shutdown_stress.cpp +++ b/tests/test_shutdown_stress.cpp @@ -23,7 +23,7 @@ #include <pthread.h> #include <stddef.h> -#define THREAD_COUNT 100 +#define THREAD_COUNT 10 extern "C" { @@ -31,7 +31,7 @@ extern "C" { int rc; - rc = zmq_connect (s, "tcp://127.0.0.1:5555"); + rc = zmq_connect (s, "tcp://127.0.0.1:5560"); assert (rc == 0); // Start closing the socket while the connecting process is underway. @@ -61,7 +61,7 @@ int main (int argc, char *argv []) s1 = zmq_socket (ctx, ZMQ_REP); assert (s1); - rc = zmq_bind (s1, "tcp://127.0.0.1:5555"); + rc = zmq_bind (s1, "tcp://127.0.0.1:5560"); assert (rc == 0); for (i = 0; i != THREAD_COUNT; i++) { |