travis: osx build brew before depends

diff --git a/.travis.yml b/.travis.yml
index e4e5da8839f516ba197aa0e4ca5d017cf1e237dc..2deb149d4c2e37e4e8a33ce29a30ff5fb70d7215 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,16 +20,12 @@ env:
         - PATH="${PATH}:${HOME}/.local/bin"
         - CFLAGS="${CFLAGS} -O0 -g -DNDEBUG"
 before_script:
-    - ./scripts/bootstrap-depends.sh ${HOME}/.local
     - pip install --user travis -r tests/pydnstest/requirements.txt cpp-coveralls
-    - test $TRAVIS_OS_NAME = osx \
-      && brew update \
-      && brew install python
+    - ./scripts/bootstrap-depends.sh ${HOME}/.local
 script:
     - make ${MAKEOPTS} check COVERAGE=1
 after_success:
-    - test $TRAVIS_OS_NAME = linux \
-      && coveralls -i lib -x ".c" --gcov-options '\-lp'
+    - test $TRAVIS_OS_NAME = linux && coveralls -i lib -x ".c" --gcov-options '\-lp'
 sudo: false
 cache:
     directories:

diff --git a/scripts/bootstrap-depends.sh b/scripts/bootstrap-depends.sh
index 7638aaa3694089776fb1a8b4169ff824fa2d8040..917afee642fe9e10cc098386203d512cea8c9d7c 100755 (executable)
--- a/scripts/bootstrap-depends.sh
+++ b/scripts/bootstrap-depends.sh
@@ -12,6 +12,12 @@ PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
 install -d ${PREFIX}/{lib,libexec,include,bin,sbin,man,share,etc,info,doc,var}
 [ ! -d .depend ] && mkdir .depend; cd .depend
 
+# platform-specific
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+       brew upgrade
+       brew install python
+fi
+
 # liburcu
 if [ ! -e ${PREFIX}/include/urcu.h ]; then
        git clone -b ${URCU_TAG} git://git.urcu.so/userspace-rcu.git || true