Restructure travis config and add tests for osx.

Also start doing builds on ubuntu trusty (14.04) instead of precise (12.04).

diff --git a/.travis.yml b/.travis.yml
index e358fe1e193d960c56f3e4301de598476e069740..bbde26bdef8574e418f7813d44a0d394c612519b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,48 @@
 language: c
-compiler:
-  - gcc
-  - clang
-env:
-  - BUILDDIR=. TOOL="./configure"
-  - BUILDDIR=. TOOL="./configure --zlib-compat"
-  - BUILDDIR=../build TOOL="../zlib-ng/configure --zlib-compat"
-  - BUILDDIR=. TOOL="./configure --zlib-compat --without-optimizations --without-new-strategies"
-  - BUILDDIR=. TOOL="cmake ."
-  - BUILDDIR=../build TOOL="cmake ../zlib-ng"
-script: mkdir -p $BUILDDIR && cd $BUILDDIR &&
-        $TOOL && make && make test
+cache: ccache
+dist: trusty
+osx_image: xcode8.2
+
+matrix:
+  include:
+    - os: linux
+      compiler: gcc
+      env: BUILDDIR=. TOOL="./configure"
+    - os: linux
+      compiler: gcc
+      env: BUILDDIR=../build TOOL="../zlib-ng/configure --zlib-compat"
+    - os: linux
+      compiler: gcc
+      env: BUILDDIR=. TOOL="./configure --zlib-compat --without-optimizations --without-new-strategies"
+    - os: linux
+      compiler: gcc
+      env: BUILDDIR=. TOOL="cmake ."
+    - os: linux
+      compiler: gcc
+      env: BUILDDIR=../build TOOL="cmake ../zlib-ng"
+
+    - os: linux
+      compiler: clang
+      env: BUILDDIR=. TOOL="./configure --zlib-compat"
+    - os: linux
+      compiler: clang
+      env: BUILDDIR=../build TOOL="cmake ../zlib-ng"
+
+    - os: osx
+      compiler: gcc
+      env: BUILDDIR=. TOOL="./configure --zlib-compat"
+    - os: osx
+      compiler: gcc
+      env: BUILDDIR=../build TOOL="../zlib-ng/configure --zlib-compat"
+    - os: osx
+      compiler: gcc
+      env: BUILDDIR=. TOOL="cmake ."
+
+    - os: osx
+      compiler: clang
+      env: BUILDDIR=. TOOL="./configure --zlib-compat"
+    - os: osx
+      compiler: clang
+      env: BUILDDIR=../build TOOL="cmake ../zlib-ng"
+
+script: mkdir -p $BUILDDIR && cd $BUILDDIR && $TOOL && make -j2 && make test