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

meson: fix tests on windows 

The tests call chmod unconditionally, which is obviously problematic on
Windows. I have an idea for a more robust fix in Meson, but in the mean
time we can avoid the problem by not going into the test directory if
kyua and atf_sh aren't found or are disabled.
Dylan Baker 2022-08-26 10:03:49 -07:00
parent 0226cdda6d
commit 1cd84fec98
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -120,9 +120,11 @@ pkgconf_exe = executable('pkgconf',
with_tests = get_option('tests') with_tests = get_option('tests')
kyua_exe = find_program('kyua', required : with_tests, disabler : true) kyua_exe = find_program('kyua', required : with_tests, disabler : true)
atf_sh_exe = find_program('atf-sh', required : with_tests, disabler : true) atf_sh_exe = find_program('atf-sh', required : with_tests, disabler : true)
if kyua_exe.found() and atf_sh_exe.found()
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')