aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2019-08-30 03:48:20 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2019-09-01 22:58:33 +0300
commit48f3495178c64b17d267f3ae0193f18076515e98 (patch)
treefe492b50bb9406b0b5f26460b6186b3588ff20ac /run_tests.py
parent5f9dccb9bce957979efa6efea961192a12f76790 (diff)
downloadmeson-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.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py2
1 files changed, 1 insertions, 1 deletions
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