dcbaker
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'meson: use a feature option for tests instead of boolean' (#244) from dcbaker/pkgconf:tests-feature into master 

Reviewed-on: ariadne/pkgconf#244
master
Ariadne Conill 2022-08-20 13:27:45 +00:00
parent bddf1641f8 fa803c7ecd
commit 0226cdda6d
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@ -1,7 +1,7 @@
project('pkgconf', 'c', project('pkgconf', 'c',
version : '1.9.3', version : '1.9.3',
license : 'ISC', license : 'ISC',
meson_version : '>=0.47', meson_version : '>=0.49',
default_options : ['c_std=c99'], default_options : ['c_std=c99'],
) )
@ -117,13 +117,12 @@ pkgconf_exe = executable('pkgconf',
c_args: build_static, c_args: build_static,
install : true) install : true)
if get_option('tests') with_tests = get_option('tests')
kyua_exe = find_program('kyua') kyua_exe = find_program('kyua', required : with_tests, disabler : true)
atf_sh_exe = find_program('atf-sh') atf_sh_exe = find_program('atf-sh', required : with_tests, disabler : true)
kyuafile = configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata) kyuafile = configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile', kyuafile, '--build-root', meson.current_build_dir()]) test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile', kyuafile, '--build-root', meson.current_build_dir()])
subdir('tests') subdir('tests')
endif
install_man('man/pkgconf.1') install_man('man/pkgconf.1')
install_man('man/pkg.m4.7') install_man('man/pkg.m4.7')

6
meson_options.txt
View File

@ -1,3 +1,5 @@
option('tests', type: 'boolean', value: true, option(
description: 'Build tests which depends upon the kyua framework' 'tests',
type: 'feature',
description: 'Build tests which depends upon the kyua framework',
) )