Merge remote-tracking branch 'upstream/master' into inproc_connect_before_bind

.gitignore

@@ -22,6 +22,7 @@ autom4te.cache
 .*~
 tools/curve_keygen.o
 tools/curve_keygen
+tests/test_ctx_destroy
 tests/test_term_endpoint
 tests/test_system
 tests/test_monitor

.travis.yml

-script: ./autogen.sh && ./configure && make && make check
+#   libzmq
+
 language: c
+
+#   Build required projects first
+before_script:
+
+#   libsodium
+- git clone git://github.com/jedisct1/libsodium.git
+- cd libsodium
+- ./autogen.sh
+- ./configure && make check
+- sudo make install
+- sudo ldconfig
+- cd ..
+
+#   Build and check libzmq
+script: ./autogen.sh && ./configure && make && make check

tests/test_security_curve.cpp

@@ -49,8 +49,6 @@ static void zap_handler (void *ctx)
         char *address = s_recv (zap);
         char *identity = s_recv (zap);
         char *mechanism = s_recv (zap);
-        printf ("CURVE domain=%s address=%s identity=%s mechanism=%s\n",
-                domain, address, identity, mechanism);
         uint8_t client_key [32];
         int size = zmq_recv (zap, client_key, 32, 0);
         assert (size == 32);

tests/test_security_null.cpp

@@ -43,8 +43,6 @@ zap_handler (void *ctx)
         char *identity = s_recv (zap);
         char *mechanism = s_recv (zap);
 
-        printf ("domain=%s address=%s identity=%s mechanism=%s\n",
-                domain, address, identity, mechanism);
         assert (streq (version, "1.0"));
         assert (streq (mechanism, "NULL"));
         assert (streq (identity, "IDENT"));

tests/test_security_plain.cpp

@@ -43,8 +43,6 @@ zap_handler (void *ctx)
         char *mechanism = s_recv (zap);
         char *username = s_recv (zap);
         char *password = s_recv (zap);
-        printf ("PLAIN domain=%s address=%s identity=%s mechanism=%s\n",
-                domain, address, identity, mechanism);
 
         assert (streq (version, "1.0"));
         assert (streq (mechanism, "PLAIN"));

tests/test_system.cpp

@@ -71,7 +71,7 @@ int main (void)
             printf ("I: Tune your system to increase maximum allowed file handles\n");
 #if defined (ZMQ_HAVE_OSX)
             printf ("I: On OS/X, run 'ulimit -n 1200' in bash");
-#elseif defined (ZMQ_HAVE_LINUX)
+#elif defined (ZMQ_HAVE_LINUX)
             printf ("I: On Linux, run 'ulimit -n 1200' in bash");
 #endif        
             return -1;