typing: fixup of #7688

This bug not beeing caught in review is another reason for
adding strict typing support to meson.
pull/7657/head
Daniel Mensinger 4 years ago
parent 4253bf6281
commit 8f95efe40b
No known key found for this signature in database
GPG Key ID: 54DD94C131E277D4
  1. 2
      mesonbuild/mcompile.py
  2. 4
      run_tests.py

@ -139,7 +139,7 @@ def get_parsed_args_ninja(options: 'argparse.Namespace', builddir: Path) -> T.Li
runner = detect_ninja() runner = detect_ninja()
if runner is None: if runner is None:
raise MesonException('Cannot find ninja.') raise MesonException('Cannot find ninja.')
mlog.log('Found runner:', runner) mlog.log('Found runner:', str(runner))
cmd = runner + ['-C', builddir.as_posix()] cmd = runner + ['-C', builddir.as_posix()]

@ -42,7 +42,7 @@ NINJA_CMD = None
# test that we run. # test that we run.
if 'CI' in os.environ: if 'CI' in os.environ:
NINJA_1_9_OR_NEWER = True NINJA_1_9_OR_NEWER = True
NINJA_CMD = 'ninja' NINJA_CMD = ['ninja']
else: else:
# Look for 1.9 to see if https://github.com/ninja-build/ninja/issues/1219 # Look for 1.9 to see if https://github.com/ninja-build/ninja/issues/1219
# is fixed # is fixed
@ -221,7 +221,7 @@ def get_backend_commands(backend, debug=False):
test_cmd = cmd + ['-target', 'RUN_TESTS'] test_cmd = cmd + ['-target', 'RUN_TESTS']
elif backend is Backend.ninja: elif backend is Backend.ninja:
global NINJA_CMD global NINJA_CMD
cmd = [NINJA_CMD, '-w', 'dupbuild=err', '-d', 'explain'] cmd = NINJA_CMD + ['-w', 'dupbuild=err', '-d', 'explain']
if debug: if debug:
cmd += ['-v'] cmd += ['-v']
clean_cmd = cmd + ['clean'] clean_cmd = cmd + ['clean']

Loading…
Cancel
Save