diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-08 16:19:28 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-08 16:19:28 +0530 |
| commit | 1e1abc675e703ab82c51da63457b63fbbdfbce70 (patch) | |
| tree | 88ff2c67b8ddd7552fcf4d2f985b8a47760e3cd7 /.travis.yml | |
| parent | d41b903f07dde2b8330f2fea6b4e7b279e099f4c (diff) | |
| download | meson-1e1abc675e703ab82c51da63457b63fbbdfbce70.zip meson-1e1abc675e703ab82c51da63457b63fbbdfbce70.tar.gz meson-1e1abc675e703ab82c51da63457b63fbbdfbce70.tar.bz2 | |
travis.yml: Export CC and CXX inside the docker instance
docker does not inherit the parent environment and loses the CC/CXX
settings for testing against clang and gcc.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 964c157..8648572 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,5 +36,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 -- $MESON_ARGS"; 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 |