From 52370bff4485d6aa3e84ccf49f4f6020b50b76af Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Thu, 12 Sep 2013 12:46:23 +0200 Subject: [PATCH 1/3] Removed debugging printfs --- tests/test_security_curve.cpp | 2 -- tests/test_security_null.cpp | 2 -- tests/test_security_plain.cpp | 2 -- 3 files changed, 6 deletions(-) diff --git a/tests/test_security_curve.cpp b/tests/test_security_curve.cpp index c394d6de..fc7a4668 100644 --- a/tests/test_security_curve.cpp +++ b/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); diff --git a/tests/test_security_null.cpp b/tests/test_security_null.cpp index 8a2500d3..9543e154 100644 --- a/tests/test_security_null.cpp +++ b/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")); diff --git a/tests/test_security_plain.cpp b/tests/test_security_plain.cpp index 8aaf5e41..da37fb0f 100644 --- a/tests/test_security_plain.cpp +++ b/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")); From d1ba8a50d2fad55dbb000065326e2e9138bfd1d0 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Thu, 12 Sep 2013 12:46:43 +0200 Subject: [PATCH 2/3] Extended TravisCI build to use libsodium --- .travis.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aafbbd1d..39c3dbe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,18 @@ -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 From ac8c72cea68235faffe71b248bf45ae57fe5619f Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Thu, 12 Sep 2013 12:47:14 +0200 Subject: [PATCH 3/3] Added test_ctx_destroy to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 07e6a8d1..519d591d 100644 --- a/.gitignore +++ b/.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