diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-08-30 03:48:20 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-09-01 22:58:33 +0300 |
| commit | 48f3495178c64b17d267f3ae0193f18076515e98 (patch) | |
| tree | fe492b50bb9406b0b5f26460b6186b3588ff20ac | |
| parent | 5f9dccb9bce957979efa6efea961192a12f76790 (diff) | |
| download | meson-48f3495178c64b17d267f3ae0193f18076515e98.zip meson-48f3495178c64b17d267f3ae0193f18076515e98.tar.gz meson-48f3495178c64b17d267f3ae0193f18076515e98.tar.bz2 | |
tests: Upgrade to ninja v1.9 for Linux
Also use the upstream release. This eliminates Meson CI's dependence
on my server.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | run_tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 19e91ee..019d51a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ script: ci_env=`bash <(curl -s https://codecov.io/env)` docker run --security-opt seccomp:unconfined $ci_env -v ${PWD}/.coverage:/root/.coverage \ withgit \ - /bin/sh -c "cd /root && mkdir -p tools; wget -c http://nirbheek.in/files/binaries/ninja/linux-amd64/ninja -O /root/tools/ninja; chmod +x /root/tools/ninja; CC=$CC CXX=$CXX OBJC=$CC OBJCXX=$CXX PATH=/root/tools:$PATH MESON_FIXED_NINJA=1 ./run_tests.py $RUN_TESTS_ARGS -- $MESON_ARGS && chmod -R a+rwX .coverage" + /bin/sh -c "cd /root && mkdir -p tools; wget -c https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip -O /root/tools/ninja.zip; unzip -d /root/tools /root/tools/ninja.zip; chmod +x /root/tools/ninja; CC=$CC CXX=$CXX OBJC=$CC OBJCXX=$CXX PATH=/root/tools:$PATH ./run_tests.py $RUN_TESTS_ARGS -- $MESON_ARGS && chmod -R a+rwX .coverage" fi # Ensure that llvm is added after $PATH, otherwise the clang from that llvm install will be used instead of the native apple clang. - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib OBJC=$CC OBJCXX=$CXX PATH=$HOME/tools:/usr/local/opt/qt/bin:$PATH:$(brew --prefix llvm)/bin ./run_tests.py $RUN_TESTS_ARGS --backend=ninja -- $MESON_ARGS ; fi diff --git a/run_tests.py b/run_tests.py index f747b66..60097a8 100755 --- a/run_tests.py +++ b/run_tests.py @@ -233,7 +233,7 @@ def ensure_backend_detects_changes(backend): # timestamps and not running on HFS+ which only stores dates in seconds: # https://developer.apple.com/legacy/library/technotes/tn/tn1150.html#HFSPlusDates # FIXME: Upgrade Travis image to Apple FS when that becomes available - if (NINJA_1_9_OR_NEWER or ('MESON_FIXED_NINJA' in os.environ)) and not mesonlib.is_osx(): + if NINJA_1_9_OR_NEWER and not mesonlib.is_osx(): return # This is needed to increase the difference between build.ninja's # timestamp and the timestamp of whatever you changed due to a Ninja |