summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimír Čunát <vladimir.cunat@nic.cz>2022-05-30 13:48:16 +0200
committerVladimír Čunát <vladimir.cunat@nic.cz>2022-06-01 10:10:41 +0200
commit04abfbe1d0cede34358f66e11ec58bb6266b976f (patch)
treeedcf259446981d499ba2415725406c01c99693d4
parentMerge !1302: renumber: allow renumbering a subnet to a single IP (diff)
downloadknot-resolver-04abfbe1d0cede34358f66e11ec58bb6266b976f.tar.xz
knot-resolver-04abfbe1d0cede34358f66e11ec58bb6266b976f.zip
meson nit: deal with warning about future of run_command
WARNING: You should add the boolean check kwarg to the run_command call. It currently defaults to false, but it will default to true in future releases of meson. See also: https://github.com/mesonbuild/meson/issues/9300 In almost all cases we already check the return code explicitly and throw a more descriptive message than what would be the default.
-rw-r--r--daemon/lua/meson.build2
-rw-r--r--doc/meson.build10
-rw-r--r--etc/config/meson.build2
-rw-r--r--modules/policy/meson.build3
-rw-r--r--tests/meson.build8
5 files changed, 13 insertions, 12 deletions
diff --git a/daemon/lua/meson.build b/daemon/lua/meson.build
index 410cb023..c5f4df09 100644
--- a/daemon/lua/meson.build
+++ b/daemon/lua/meson.build
@@ -87,7 +87,7 @@ if get_option('kres_gen_test') and not meson.is_cross_build()
'''.format(ttc.get('tname'), tsize)
endforeach
# Now feed it directly into luajit.
- kres_gen_test = run_command(find_program('luajit'), '-e', kres_gen_test_luastr)
+ kres_gen_test = run_command(find_program('luajit'), '-e', kres_gen_test_luastr, check: false)
if kres_gen_test.returncode() != 0
error('if you use released Knot* versions, please contact us: https://www.knot-resolver.cz/contact/\n'
+ kres_gen_test.stderr().strip())
diff --git a/doc/meson.build b/doc/meson.build
index e64d8e93..72a8a7b0 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -4,7 +4,7 @@
# man page
man_config = configuration_data()
man_config.set('version', meson.project_version())
-man_config.set('date', run_command('../scripts/get-date.sh').stdout())
+man_config.set('date', run_command('../scripts/get-date.sh', check: true).stdout())
man_config.set('man_seealso_systemd', '')
if systemd_files == 'enabled'
@@ -30,20 +30,20 @@ if get_option('doc') == 'enabled'
makeinfo = find_program('makeinfo', required: false)
# python dependencies: breathe, sphinx_rtd_theme
- python_breathe = run_command('python3', '-c', 'import breathe')
+ python_breathe = run_command('python3', '-c', 'import breathe', check: false)
if python_breathe.returncode() != 0
# some distros might use python2 sphinx
- python_breathe = run_command('python2', '-c', 'import breathe')
+ python_breathe = run_command('python2', '-c', 'import breathe', check: false)
if python_breathe.returncode() != 0
error('missing doc dependency: python breathe')
else
- python_sphinx_rtd_theme = run_command('python2', '-c', 'import sphinx_rtd_theme')
+ python_sphinx_rtd_theme = run_command('python2', '-c', 'import sphinx_rtd_theme', check: false)
if python_sphinx_rtd_theme.returncode() != 0
error('missing doc dependency: python sphinx_rtd_theme')
endif
endif
else
- python_sphinx_rtd_theme = run_command('python3', '-c', 'import sphinx_rtd_theme')
+ python_sphinx_rtd_theme = run_command('python3', '-c', 'import sphinx_rtd_theme', check: false)
if python_sphinx_rtd_theme.returncode() != 0
error('missing doc dependency: python sphinx_rtd_theme')
endif
diff --git a/etc/config/meson.build b/etc/config/meson.build
index a4a9c500..ca888084 100644
--- a/etc/config/meson.build
+++ b/etc/config/meson.build
@@ -21,7 +21,7 @@ install_data(
# kresd.conf
install_kresd_conf = get_option('install_kresd_conf') == 'enabled'
if get_option('install_kresd_conf') == 'auto'
- if run_command(['test', '-r', etc_dir / 'kresd.conf']).returncode() == 1
+ if run_command(['test', '-r', etc_dir / 'kresd.conf'], check: false).returncode() == 1
install_kresd_conf = true
endif
endif
diff --git a/modules/policy/meson.build b/modules/policy/meson.build
index fd51b0fd..37f16839 100644
--- a/modules/policy/meson.build
+++ b/modules/policy/meson.build
@@ -19,7 +19,8 @@ integr_tests += [
# check git submodules were initialized
lua_ac_submodule = run_command(['test', '-r',
- '@0@/lua-aho-corasick/ac_fast.cxx'.format(meson.current_source_dir())])
+ '@0@/lua-aho-corasick/ac_fast.cxx'.format(meson.current_source_dir())],
+ check: false)
if lua_ac_submodule.returncode() != 0
error('run "git submodule update --init --recursive" to initialize git submodules')
endif
diff --git a/tests/meson.build b/tests/meson.build
index 1647b30f..818169df 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -22,15 +22,15 @@ endif
## config tests
if build_config_tests
message('--- config_tests dependencies ---')
- cqueues = run_command('luajit', '-l', 'cqueues', '-e', 'os.exit(0)') # luajit -l $(1) -e "os.exit(0)"
+ cqueues = run_command('luajit', '-l', 'cqueues', '-e', 'os.exit(0)', check: false) # luajit -l $(1) -e "os.exit(0)"
if cqueues.returncode() != 0
error('missing luajit package: cqueues')
endif
- basexx = run_command('luajit', '-l', 'basexx', '-e', 'os.exit(0)') # luajit -l $(1) -e "os.exit(0)"
+ basexx = run_command('luajit', '-l', 'basexx', '-e', 'os.exit(0)', check: false) # luajit -l $(1) -e "os.exit(0)"
if basexx.returncode() != 0
error('missing luajit package: basexx')
endif
- ffi = run_command('luajit', '-l', 'ffi', '-e', 'os.exit(0)') # luajit -l $(1) -e "os.exit(0)"
+ ffi = run_command('luajit', '-l', 'ffi', '-e', 'os.exit(0)', check: false) # luajit -l $(1) -e "os.exit(0)"
if ffi.returncode() != 0
error('missing luajit package: ffi')
endif
@@ -52,7 +52,7 @@ if build_extra_tests
endif
foreach py3_dep : py3_deps
- py3_import = run_command(python3, '-c', 'import @0@'.format(py3_dep[0]))
+ py3_import = run_command(python3, '-c', 'import @0@'.format(py3_dep[0]), check: false)
if py3_import.returncode() != 0
error('missing python3 dependency: @0@'.format(py3_dep[1]))
endif