mirror of https://gitee.com/openkylin/libvirt.git
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>
This commit is contained in:
parent
73b760c75a
commit
fa6eea60f0
|
@ -76,7 +76,9 @@ before_install:
|
||||||
before_script:
|
before_script:
|
||||||
- ./autogen.sh
|
- ./autogen.sh
|
||||||
script:
|
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
|
# Environments here are run in addition to the main environment defined above
|
||||||
matrix:
|
matrix:
|
||||||
|
@ -89,10 +91,6 @@ matrix:
|
||||||
dist: trusty
|
dist: trusty
|
||||||
- compiler: clang
|
- compiler: clang
|
||||||
os: osx
|
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:
|
after_failure:
|
||||||
- echo '============================================================================'
|
- echo '============================================================================'
|
||||||
|
|
Loading…
Reference in New Issue