From fa6eea60f0f598060afc95ac995154460d3a08f2 Mon Sep 17 00:00:00 2001
From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 6 Sep 2017 15:58:22 +0200
Subject: [PATCH] travis: Don't have a separate script definition for macOS
Make parts of the build command OS-dependent instead.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
---
.travis.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ba8ff49a19..1ade6dfa34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,7 +76,9 @@ before_install:
before_script:
- ./autogen.sh
script:
- - make -j3 && make -j3 syntax-check && make -j3 check
+ # Many unit tests still fail on macOS, and there are a bunch of issues with
+ # syntax-check as well, so skip those steps on that platform for now
+ - make -j3 && if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j3 syntax-check && make -j3 check; fi
# Environments here are run in addition to the main environment defined above
matrix:
@@ -89,10 +91,6 @@ matrix:
dist: trusty
- compiler: clang
os: osx
- script:
- # many unit tests fail & so does syntax-check, so skip for now
- # one day we must fix it though....
- - make -j3
after_failure:
- echo '============================================================================'