From ccb1250fcc1091aeb516b8c0a756164bf434ea46 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Thu, 3 Aug 2017 14:41:36 +0100
Subject: [PATCH 1/4] Problem: a curve test uses hard-coded TCP port

Solution: use the wildcard endpoint instead
---
 tests/test_security_curve.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/test_security_curve.cpp b/tests/test_security_curve.cpp
index 0f8fd248..dbaa5659 100644
--- a/tests/test_security_curve.cpp
+++ b/tests/test_security_curve.cpp
@@ -423,7 +423,8 @@ void test_curve_security_with_null_client_credentials (void *ctx,
 #endif
 }
 
-void test_curve_security_with_plain_client_credentials (void *ctx, void *server)
+void test_curve_security_with_plain_client_credentials (void *ctx, void *server,
+                                                        char *my_endpoint)
 {
     //  This must be caught by the curve_server class, not passed to ZAP
     void *client = zmq_socket (ctx, ZMQ_DEALER);
@@ -432,7 +433,7 @@ void test_curve_security_with_plain_client_credentials (void *ctx, void *server)
     assert (rc == 0);
     rc = zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, "password", 8);
     assert (rc == 0);
-    rc = zmq_connect (client, "tcp://localhost:9998");
+    rc = zmq_connect (client, my_endpoint);
     assert (rc == 0);
     expect_bounce_fail (server, client);
     close_zero_linger (client);
@@ -566,7 +567,7 @@ int main (void)
 
     setup_context_and_server_side (&ctx, &handler, &zap_thread, &server,
                                    &server_mon, my_endpoint);
-    test_curve_security_with_plain_client_credentials (ctx, server);
+    test_curve_security_with_plain_client_credentials (ctx, server, my_endpoint);
     shutdown_context_and_server_side (ctx, zap_thread, server, server_mon);
 
     setup_context_and_server_side (&ctx, &handler, &zap_thread, &server,

From d96b0f42a6ed4677e3322e08c3a5525d060144d6 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Thu, 3 Aug 2017 14:42:14 +0100
Subject: [PATCH 2/4] Problem: additional doc-build test on Travis

Solution: remove it, as it takes time and it's enough to test once
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f357140..6cf224b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,8 +64,6 @@ matrix:
           key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
         packages:
         - libsodium-dev
-        - asciidoc
-        - xmlto
   - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled
     os: osx
   - env: BUILD_TYPE=default CURVE=tweetnacl DRAFT=enabled ADDRESS_SANITIZER=enabled

From 0c5731ac0054399131c7ba07426087a01e42e4d7 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Thu, 3 Aug 2017 14:43:36 +0100
Subject: [PATCH 3/4] Problem: 2 OSX libsodium Travis runs

Solution: remove the non-draft test run, as OSX is very slow and
overcrowded on Travis
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6cf224b8..84a81c6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,8 +53,6 @@ matrix:
         - libsodium-dev
         - asciidoc
         - xmlto
-  - env: BUILD_TYPE=default CURVE=libsodium
-    os: osx
   - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled
     os: linux
     addons:

From 5b91eb549b8834c7c003766a547ffcd63888fdfc Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Thu, 3 Aug 2017 23:11:23 +0100
Subject: [PATCH 4/4] Problem: OSX builds are very slow

Solution: avoid running brew update and brew install binutils unless
it's for the android cross-compilation, where it's necessary for
greadelf.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 84a81c6a..15131119 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,7 +78,7 @@ matrix:
 sudo: required
 
 before_install:
-- if [ $TRAVIS_OS_NAME == "osx" ] ; then brew update; brew install binutils ; fi
+- if [ $TRAVIS_OS_NAME == "osx" -a $BUILD_TYPE == "android" ] ; then brew install binutils ; fi
 - if [ $TRAVIS_OS_NAME == "osx" -a $CURVE == "libsodium" ] ; then brew install libsodium ; fi
 
 before_script: