X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=.travis.yml;h=6b710cc3a8df825073e753fa21435ceda5da95a1;hp=bf0433de520d7383c3e0408095be1ebbe70ade73;hb=6463db6c1d3a2a961008e87a86d464b596886f1a;hpb=3c746856fd63f3f7624a34ea70e226a290d9cc01

diff --git a/.travis.yml b/.travis.yml
index bf0433de..6b710cc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,58 @@
 language: c
+dist: bionic
+os:
+  - linux
 compiler:
   - clang
   - gcc
+env:
+  matrix:
+    - BUILD_ARCH="x86"
+    - BUILD_ARCH="x86_64"
+  global:
+    - MAKEFLAGS="-j 2"
+matrix:
+  include:
+    # Default xcode image
+    - os: osx
+      compiler: clang # Workaround travis setting CC=["clang", "gcc"]
+      env: BUILD_ARCH="x86_64"
+    # Latest xcode image (needs periodic updating)
+    - os: osx
+      compiler: clang
+      osx_image: xcode11.2
+      env: BUILD_ARCH="x86_64"
+  exclude:
+    - os: osx
+      compiler: gcc
+  exclude:
+    - os: linux
+      compiler: clang
+      env: BUILD_ARCH="x86" # Only do the gcc x86 build to reduce clutter
 before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -qq -y libaio-dev libnuma-dev libz-dev
+  - EXTRA_CFLAGS="-Werror"
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+        pkgs=(libaio-dev libcunit1 libcunit1-dev libgoogle-perftools4 libibverbs-dev libiscsi-dev libnuma-dev librbd-dev librdmacm-dev libz-dev);
+        if [[ "$BUILD_ARCH" == "x86" ]]; then
+            pkgs=("${pkgs[@]/%/:i386}");
+            pkgs+=(gcc-multilib python-scipy);
+            EXTRA_CFLAGS="${EXTRA_CFLAGS} -m32";
+        else
+            pkgs+=(glusterfs-common python-scipy);
+        fi;
+        sudo apt-get -qq update;
+        sudo apt-get install --no-install-recommends -qq -y "${pkgs[@]}";
+    fi;
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+        brew update;
+        brew install cunit;
+        if [[ "$TRAVIS_OSX_IMAGE" == "xcode11.2" ]]; then
+            pip3 install scipy;
+        else
+            pip install scipy;
+        fi;
+    fi;
+script:
+  - ./configure --extra-cflags="${EXTRA_CFLAGS}" && make
+  - make test
+  - sudo python3 t/run-fio-tests.py --skip 6 1007 1008 --debug