From 7849d022143393c82fbec672e07ba559574ac922 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 1 Aug 2015 19:13:20 +0100 Subject: [PATCH 1/3] Do not use ldconfig in CI if running on OSX ldconfig is not available on OSX, so Travis CI build fails --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 699951be..6c2902a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,8 @@ before_script: # libsodium - git clone git://github.com/jedisct1/libsodium.git -- ( cd libsodium; ./autogen.sh; ./configure; make check; sudo make install; sudo ldconfig ) +- ( cd libsodium; ./autogen.sh; ./configure; make check; sudo make install; + if [ $TRAVIS_OS_NAME != "osx" ] ; then sudo ldconfig ; fi ) # Build and check this project script: From 073807371c5ab164441fdea8e0de23bea81deb45 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 1 Aug 2015 19:14:28 +0100 Subject: [PATCH 2/3] Add OSX build to travis config. Fixes #56 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6c2902a8..658f0b12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ language: c +os: +- linux +- osx + # Build required projects first before_script: From 866b02895febdd1b0fa5e91c426b6fef9912e31d Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 2 Aug 2015 19:14:52 +0100 Subject: [PATCH 3/3] Increase file limit in travis config Test cases occasionally fail, especially on OSX, due to socket limit. --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 658f0b12..f9ce5af8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,11 @@ before_script: - ( cd libsodium; ./autogen.sh; ./configure; make check; sudo make install; if [ $TRAVIS_OS_NAME != "osx" ] ; then sudo ldconfig ; fi ) +# ZMQ stress tests need more open socket (files) than the usual default +# On OSX, it seems the way to set the max files limit is constantly changing, so +# try to use all known knobs to ensure compatibility across various versions +- if [ $TRAVIS_OS_NAME == "osx" ] ; then sudo sysctl -w kern.maxfiles=64000 ; sudo sysctl -w kern.maxfilesperproc=64000 ; sudo launchctl limit maxfiles 64000 64000 ; fi ; ulimit -n 64000 + # Build and check this project script: - ./autogen.sh && ./configure && make && make check