diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-04 13:52:32 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-04 13:55:52 +0530 |
commit | 9ec6c7e238386e1b884525e2a1a1227bdb17a24a (patch) | |
tree | 7cf5e7b7f4249c83fc8bedb786277346825aa6fc /.travis.yml | |
parent | 8213ef5511a52cfbe333090464b66d6dc61d1ef4 (diff) | |
download | meson-9ec6c7e238386e1b884525e2a1a1227bdb17a24a.zip meson-9ec6c7e238386e1b884525e2a1a1227bdb17a24a.tar.gz meson-9ec6c7e238386e1b884525e2a1a1227bdb17a24a.tar.bz2 |
travis.yml: Run tests for both unity builds too
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 857c5c4..51c5c1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,10 @@ compiler: - gcc - clang +env: + - MESON_ARGS="" + - MESON_ARGS="--unity" + language: - cpp @@ -26,5 +30,5 @@ script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM jpakkane/mesonci:yakkety > Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true ./run_tests.py"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) ./run_tests.py --backend=ninja ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true ./run_tests.py -- $MESON_ARGS"; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) ./run_tests.py --backend=ninja -- $MESON_ARGS ; fi |