aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2020-02-16 18:31:32 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2020-02-22 06:49:34 +0530
commitbe486a2ec84f22052fba5ba16de136de00379966 (patch)
tree0c4a71a532fc702336fbb503af730d4bf017effd /run_tests.py
parentfeb82e0f0f365d66199d697f1d99e109e2c6a700 (diff)
downloadmeson-be486a2ec84f22052fba5ba16de136de00379966.zip
meson-be486a2ec84f22052fba5ba16de136de00379966.tar.gz
meson-be486a2ec84f22052fba5ba16de136de00379966.tar.bz2
ninjabackend: List PDBs in output list for targets
This is more correct, and forces the target(s) to be rebuilt if the PDB files are missing. Increases the minimum required Ninja to 1.7, which is available in Ubuntu 16.04 under backports. We can't do the same for import libraries, because it is impossible for us to know at configure time whether or not an import library will be generated for a given DLL.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/run_tests.py b/run_tests.py
index 535c792..3237e85 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -45,17 +45,15 @@ if 'CI' in os.environ:
NINJA_CMD = 'ninja'
else:
# Look for 1.9 to see if https://github.com/ninja-build/ninja/issues/1219
- # is fixed, else require 1.6 for -w dupbuild=err
- for v in ('1.9', '1.6'):
- NINJA_CMD = detect_ninja(v)
- if NINJA_CMD is not None:
- if mesonlib.version_compare(v, '>=1.9'):
- NINJA_1_9_OR_NEWER = True
- else:
- mlog.warning('Found ninja <1.9, tests will run slower', once=True)
- break
+ # is fixed
+ NINJA_CMD = detect_ninja('1.9')
+ if NINJA_CMD is not None:
+ NINJA_1_9_OR_NEWER = True
+ else:
+ mlog.warning('Found ninja <1.9, tests will run slower', once=True)
+ NINJA_CMD = detect_ninja()
if NINJA_CMD is None:
- raise RuntimeError('Could not find Ninja v1.6 or newer')
+ raise RuntimeError('Could not find Ninja v1.7 or newer')
def guess_backend(backend, msbuild_exe: str):
# Auto-detect backend if unspecified