diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-09-04 15:50:30 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-09-08 20:15:59 +0200 |
| commit | 8f95efe40b6af4b49b692d1875066759c44a009d (patch) | |
| tree | 467e627b5870e84ce945c019fa279a0f41ab019e | |
| parent | 4253bf62814997bd2c985a2a72e86c260338fb4d (diff) | |
| download | meson-8f95efe40b6af4b49b692d1875066759c44a009d.tar.gz | |
typing: fixup of #7688
This bug not beeing caught in review is another reason for
adding strict typing support to meson.
| -rw-r--r-- | mesonbuild/mcompile.py | 2 | ||||
| -rwxr-xr-x | run_tests.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py index 326752950..f91f05d61 100644 --- a/mesonbuild/mcompile.py +++ b/mesonbuild/mcompile.py @@ -139,7 +139,7 @@ def get_parsed_args_ninja(options: 'argparse.Namespace', builddir: Path) -> T.Li runner = detect_ninja() if runner is None: raise MesonException('Cannot find ninja.') - mlog.log('Found runner:', runner) + mlog.log('Found runner:', str(runner)) cmd = runner + ['-C', builddir.as_posix()] diff --git a/run_tests.py b/run_tests.py index 2648e06d7..08ad78a61 100755 --- a/run_tests.py +++ b/run_tests.py @@ -42,7 +42,7 @@ NINJA_CMD = None # test that we run. if 'CI' in os.environ: NINJA_1_9_OR_NEWER = True - NINJA_CMD = 'ninja' + NINJA_CMD = ['ninja'] else: # Look for 1.9 to see if https://github.com/ninja-build/ninja/issues/1219 # is fixed @@ -221,7 +221,7 @@ def get_backend_commands(backend, debug=False): test_cmd = cmd + ['-target', 'RUN_TESTS'] elif backend is Backend.ninja: global NINJA_CMD - cmd = [NINJA_CMD, '-w', 'dupbuild=err', '-d', 'explain'] + cmd = NINJA_CMD + ['-w', 'dupbuild=err', '-d', 'explain'] if debug: cmd += ['-v'] clean_cmd = cmd + ['clean'] |