From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Mon, 9 Feb 2015 23:12:43 +0000 (+0100)
Subject: travis: matrix ff, python from brew
X-Git-Tag: v1.0.0-beta1~330^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcc7bd6bfbe59f8f8de44519ce629e63a5f01dfe;p=thirdparty%2Fknot-resolver.git

travis: matrix ff, python from brew
---

diff --git a/.travis.yml b/.travis.yml
index e536d373f..e4e5da883 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,10 @@ notifications:
     email:
         on_success: change
         on_failure: change
+matrix:
+    fast_finish: true
+    allow_failures:
+        - os: osx
 env:
     global:
         - PKG_CONFIG_PATH="${HOME}/.local/lib/pkgconfig"
@@ -18,10 +22,14 @@ env:
 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
 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: