aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-07-18 18:19:55 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2017-09-18 18:40:24 +0300
commit7c2ae55fab2f0837531188373d276f168845e62f (patch)
treefe72c10b2da78e49add1c593512e1012d2f261df /run_tests.py
parentb9154dd07c357ba616deefb7a608e8b2ca85b7ec (diff)
downloadmeson-7c2ae55fab2f0837531188373d276f168845e62f.zip
meson-7c2ae55fab2f0837531188373d276f168845e62f.tar.gz
meson-7c2ae55fab2f0837531188373d276f168845e62f.tar.bz2
Revert "Revert "Merge pull request #1931 from centricular/use-patched-ninja""
This reverts commit 5eb64a6f3e47b570f544524ef48dc6ef0e4dce59. Let's try again, with a fixed Ninja by QuLogic.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/run_tests.py b/run_tests.py
index a00898d..f74ff13 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -104,6 +104,12 @@ def get_backend_commands(backend, debug=False):
return cmd, clean_cmd, test_cmd, install_cmd, uninstall_cmd
def ensure_backend_detects_changes(backend):
+ # We're using a ninja with QuLogic's patch for sub-1s resolution 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 'MESON_FIXED_NINJA' in os.environ 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
# bug: https://github.com/ninja-build/ninja/issues/371