X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=.travis.yml;h=ca50e22644c7e6d323bde2a1996ef66686b3cc16;hp=9bef750f8a61535b30d1064e221d633fe9ae42e8;hb=8f7630813305a4f4f04a5f9ba20b2a7d486c0cfb;hpb=3bf80dad77448afcb18148e72dc6cfe04bcf7e57

diff --git a/.travis.yml b/.travis.yml
index 9bef750f..ca50e226 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,28 @@
 language: c
+os:
+  - linux
 compiler:
   - clang
   - gcc
+env:
+  global:
+    - MAKEFLAGS="-j 2"
+matrix:
+  include:
+    - os: osx
+      compiler: clang # Workaround travis setting CC=["clang", "gcc"]
+    # Build using the 10.12 SDK but target and run on OSX 10.11
+#   - os: osx
+#     compiler: clang
+#     osx_image: xcode8
+#     env: SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk MACOSX_DEPLOYMENT_TARGET=10.11
+    # Build on the latest OSX version (will eventually become obsolete)
+    - os: osx
+      compiler: clang
+      osx_image: xcode8.2
+  exclude:
+    - os: osx
+      compiler: gcc
 before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y libaio-dev libnuma-dev
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -qq -y libaio-dev libnuma-dev libz-dev; fi