Add OSx to Travis CI build

diff --git a/.travis.yml b/.travis.yml
index 34665e6ed86d6147164557d5a11e12f3ce5b8db5..2fe4507322f496507a4b27ef0b8c2a97eaec874c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,19 @@
 language: C
 sudo: required
 dist: trusty
+os:
+  - linux
+  - osx
 compiler:
   - gcc
   - clang
 env:
   - BUILD_SYSTEM=cmake
   - BUILD_SYSTEM=autotools
+before_install:
+  - if [ `uname` = "Darwin" ]; then brew update; fi
 install:
-  - sudo apt-get install -y libbz2-dev libzip-dev liblzma-dev liblzo2-dev
+  - if [ `uname` = "Darwin" ]; then brew install xz lzo lz4; fi
+  - if [ `uname` = "Linux" ]; then sudo apt-get install -y libbz2-dev libzip-dev liblzma-dev liblzo2-dev; fi
 script:
-  - build/ci_build.sh
+  - travis_wait 30 build/ci_build.sh

diff --git a/build/ci_build.sh b/build/ci_build.sh
index ff8ef2dab41484e4249391db71e8780585e561af..291983745d5503cf699f3a15fc3df82b25355ccd 100755 (executable)
--- a/build/ci_build.sh
+++ b/build/ci_build.sh
@@ -61,7 +61,7 @@ if [ -z "${BUILD_SYSTEM}" ]; then
        inputerror "Missing type (-t) parameter"
 fi
 if [ -z "${BUILDDIR}" ]; then
-       BUILDDIR="${CURDIR}/BUILD/${BUILD_SYSTEM}"
+       BUILDDIR="${CURDIR}/build_ci/${BUILD_SYSTEM}"
 fi
 mkdir -p "${BUILDDIR}"
 for action in ${ACTIONS}; do