aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-10-08 16:34:20 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2016-10-08 13:14:54 +0200
commitcd6d5a642de41ccec5c934d5a6de074599f54436 (patch)
treeb6d1e428637358232ae1a852f40c883855013b2e /.travis.yml
parent94b7b59546cfbc311336ec3700393cfff3d4a840 (diff)
downloadmeson-cd6d5a642de41ccec5c934d5a6de074599f54436.zip
meson-cd6d5a642de41ccec5c934d5a6de074599f54436.tar.gz
meson-cd6d5a642de41ccec5c934d5a6de074599f54436.tar.bz2
travis: Manually export TRAVIS=true for linux builds
Docker wipes the environment before starting a build, so TRAVIS doesn't get set and our run_tests.py script doesn't print logs for failing tests.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 9b4e0a1..fdf82ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,5 +22,5 @@ script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM jpakkane/mesonci:xenial > 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 && ./run_tests.py"; 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