system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-07 08:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add check:true/false to all run_command() invocations

Browse source 
meson-0.59.4-1.fc35.noarch says:
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
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-11-17 13:58:53 +01:00
parent d59d6cc154
commit e92777d275
1 changed files with 46 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
meson.build
View file

@ -27,7 +27,8 @@ project_source_root = meson.current_source_dir()
project_build_root = meson.current_build_dir() project_build_root = meson.current_build_dir()
relative_source_path = run_command('realpath', relative_source_path = run_command('realpath',
'--relative-to=@0@'.format(project_build_root), '--relative-to=@0@'.format(project_build_root),
project_source_root).stdout().strip() project_source_root,
check : true).stdout().strip()
conf.set_quoted('RELATIVE_SOURCE_PATH', relative_source_path) conf.set_quoted('RELATIVE_SOURCE_PATH', relative_source_path)
conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer', conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer',
@ -47,7 +48,7 @@ fuzzer_build = want_ossfuzz or want_libfuzzer
# Try to install the git pre-commit hook # Try to install the git pre-commit hook
add_git_hook_sh = find_program('tools/add-git-hook.sh', required : false) add_git_hook_sh = find_program('tools/add-git-hook.sh', required : false)
if add_git_hook_sh.found() if add_git_hook_sh.found()
git_hook = run_command(add_git_hook_sh) git_hook = run_command(add_git_hook_sh, check : false)
if git_hook.returncode() == 0 if git_hook.returncode() == 0
message(git_hook.stdout().strip()) message(git_hook.stdout().strip())
endif endif
@ -637,13 +638,13 @@ endforeach
conf.set_quoted('TELINIT', get_option('telinit-path')) conf.set_quoted('TELINIT', get_option('telinit-path'))
if run_command(ln, '--relative', '--help').returncode() != 0 if run_command(ln, '--relative', '--help', check : false).returncode() != 0
error('ln does not support --relative (added in coreutils 8.16)') error('ln does not support --relative (added in coreutils 8.16)')
endif endif
############################################################ ############################################################
if run_command('python3', '-c', 'import jinja2').returncode() != 0 if run_command('python3', '-c', 'import jinja2', check : false).returncode() != 0
error('python3 jinja2 missing') error('python3 jinja2 missing')
endif endif
@ -657,7 +658,8 @@ const char * in_word_set(const char *, @0@);
@1@ @1@
''' '''
gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C' gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C'
gperf_snippet = run_command(sh, '-c', gperf_snippet_format.format(gperf.path())) gperf_snippet = run_command(sh, '-c', gperf_snippet_format.format(gperf.path()),
check : true)
gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout()) gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout())
if cc.compiles(gperf_test) if cc.compiles(gperf_test)
gperf_len_type = 'size_t' gperf_len_type = 'size_t'
@ -740,15 +742,22 @@ endif
time_epoch = get_option('time-epoch') time_epoch = get_option('time-epoch')
if time_epoch == -1 if time_epoch == -1
time_epoch = run_command(sh, '-c', 'echo "$SOURCE_DATE_EPOCH"').stdout().strip() time_epoch = run_command(sh, '-c', 'echo "$SOURCE_DATE_EPOCH"', check : true).stdout().strip()
if time_epoch == '' and git.found() and fs.exists('.git') if time_epoch == '' and git.found() and fs.exists('.git')
# If we're in a git repository, use the creation time of the latest git tag. # If we're in a git repository, use the creation time of the latest git tag.
latest_tag = run_command(git, 'describe', '--abbrev=0', '--tags').stdout().strip() latest_tag = run_command(git, 'describe', '--abbrev=0', '--tags',
time_epoch = run_command(git, 'log', '--no-show-signature', '-1', '--format=%at', latest_tag).stdout() check : false)
if latest_tag.returncode() == 0
time_epoch = run_command(
git, 'log', '--no-show-signature', '-1', '--format=%at',
latest_tag.stdout().strip(),
check : false).stdout()
endif
endif endif
if time_epoch == '' if time_epoch == ''
NEWS = files('NEWS') NEWS = files('NEWS')
time_epoch = run_command(stat, '-c', '%Y', NEWS).stdout() time_epoch = run_command(stat, '-c', '%Y', NEWS,
check : true).stdout()
endif endif
time_epoch = time_epoch.to_int() time_epoch = time_epoch.to_int()
endif endif
@ -765,7 +774,8 @@ foreach tuple : [['system-alloc-uid-min', 'SYS_UID_MIN', 1], # Also see login.d
v = run_command( v = run_command(
awk, awk,
'/^\s*@0@\s+/ { uid=$2 } END { print uid }'.format(tuple[1]), '/^\s*@0@\s+/ { uid=$2 } END { print uid }'.format(tuple[1]),
'/etc/login.defs').stdout().strip() '/etc/login.defs',
check : false).stdout().strip()
if v == '' if v == ''
v = tuple[2] v = tuple[2]
else else
@ -795,7 +805,7 @@ nobody_user = get_option('nobody-user')
nobody_group = get_option('nobody-group') nobody_group = get_option('nobody-group')
if not meson.is_cross_build() if not meson.is_cross_build()
getent_result = run_command('getent', 'passwd', '65534') getent_result = run_command('getent', 'passwd', '65534', check : false)
if getent_result.returncode() == 0 if getent_result.returncode() == 0
name = getent_result.stdout().split(':')[0] name = getent_result.stdout().split(':')[0]
if name != nobody_user if name != nobody_user
@ -804,7 +814,7 @@ if not meson.is_cross_build()
'Your build will result in an user table setup that is incompatible with the local system.') 'Your build will result in an user table setup that is incompatible with the local system.')
endif endif
endif endif
id_result = run_command('id', '-u', nobody_user) id_result = run_command('id', '-u', nobody_user, check : false)
if id_result.returncode() == 0 if id_result.returncode() == 0
id = id_result.stdout().to_int() id = id_result.stdout().to_int()
if id != 65534 if id != 65534
@ -814,7 +824,7 @@ if not meson.is_cross_build()
endif endif
endif endif
getent_result = run_command('getent', 'group', '65534') getent_result = run_command('getent', 'group', '65534', check : false)
if getent_result.returncode() == 0 if getent_result.returncode() == 0
name = getent_result.stdout().split(':')[0] name = getent_result.stdout().split(':')[0]
if name != nobody_group if name != nobody_group
@ -823,7 +833,7 @@ if not meson.is_cross_build()
'Your build will result in an group table setup that is incompatible with the local system.') 'Your build will result in an group table setup that is incompatible with the local system.')
endif endif
endif endif
id_result = run_command('id', '-g', nobody_group) id_result = run_command('id', '-g', nobody_group, check : false)
if id_result.returncode() == 0 if id_result.returncode() == 0
id = id_result.stdout().to_int() id = id_result.stdout().to_int()
if id != 65534 if id != 65534
@ -897,7 +907,8 @@ default_locale = get_option('default-locale')
if default_locale == '' if default_locale == ''
if not meson.is_cross_build() if not meson.is_cross_build()
choose_default_locale_sh = find_program('tools/choose-default-locale.sh') choose_default_locale_sh = find_program('tools/choose-default-locale.sh')
default_locale = run_command(choose_default_locale_sh).stdout().strip() default_locale = run_command(choose_default_locale_sh,
check : true).stdout().strip()
else else
default_locale = 'C.UTF-8' default_locale = 'C.UTF-8'
endif endif
@ -3741,17 +3752,19 @@ if git.found()
all_files = run_command( all_files = run_command(
env, '-u', 'GIT_WORK_TREE', env, '-u', 'GIT_WORK_TREE',
git, '--git-dir=@0@/.git'.format(project_source_root), git, '--git-dir=@0@/.git'.format(project_source_root),
'ls-files', ':/*.[ch]') 'ls-files', ':/*.[ch]',
check : false)
if all_files.returncode() == 0
all_files = files(all_files.stdout().split())
all_files = files(all_files.stdout().split()) custom_target(
'tags',
custom_target( output : 'tags',
'tags', command : [env, 'etags', '-o', '@0@/TAGS'.format(project_source_root)] + all_files)
output : 'tags', run_target(
command : [env, 'etags', '-o', '@0@/TAGS'.format(project_source_root)] + all_files) 'ctags',
run_target( command : [env, 'ctags', '-o', '@0@/tags'.format(project_source_root)] + all_files)
'ctags', endif
command : [env, 'ctags', '-o', '@0@/tags'.format(project_source_root)] + all_files)
endif endif
if git.found() if git.found()
@ -3763,13 +3776,13 @@ endif
if git.found() if git.found()
git_head = run_command( git_head = run_command(
git, git, '--git-dir=@0@/.git'.format(project_source_root),
'--git-dir=@0@/.git'.format(project_source_root), 'rev-parse', 'HEAD',
'rev-parse', 'HEAD').stdout().strip() check : false).stdout().strip()
git_head_short = run_command( git_head_short = run_command(
git, git, '--git-dir=@0@/.git'.format(project_source_root),
'--git-dir=@0@/.git'.format(project_source_root), 'rev-parse', '--short=7', 'HEAD',
'rev-parse', '--short=7', 'HEAD').stdout().strip() check : false).stdout().strip()
run_target( run_target(
'git-snapshot', 'git-snapshot',
@ -3793,8 +3806,8 @@ alias_target('update-man-rules', update_man_rules)
############################################################ ############################################################
alt_time_epoch = run_command('date', '-Is', '-u', '-d', alt_time_epoch = run_command('date', '-Is', '-u', '-d', '@@0@'.format(time_epoch),
'@@0@'.format(time_epoch)).stdout().strip() check : true).stdout().strip()
summary({ summary({
'build mode' : get_option('mode'), 'build mode' : get_option('mode'),