diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-20 05:44:08 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-21 01:36:08 +0530 |
| commit | de45535b7dacbf4903322c3a670dadb2c5e53102 (patch) | |
| tree | d10b14151af481722dcc1e49b1900374f5780f8d | |
| parent | 68eea4818df3378a22dc91ffc00d3c750add29ba (diff) | |
| download | meson-de45535b7dacbf4903322c3a670dadb2c5e53102.zip meson-de45535b7dacbf4903322c3a670dadb2c5e53102.tar.gz meson-de45535b7dacbf4903322c3a670dadb2c5e53102.tar.bz2 | |
travis: Also set OBJC and OBJCXX to CC/CXX
Else they are only autodetected and we don't test both GCC and Clang.
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 2acb908..b3346a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,5 +40,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 CC=$CC CXX=$CXX ./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 + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX OBJC=$CC OBJCXX=$CXX ./run_tests.py -- $MESON_ARGS"; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) OBJC=$CC OBJCXX=$CXX ./run_tests.py --backend=ninja -- $MESON_ARGS ; fi |