ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

meson: pass configured files idiomatically 

Instead of attempting to figure out what the paths will be, take the
returned file object and pass that around, meson will then automatically
figure out the correct paths.
pull/240/head
Dylan Baker 2022-07-29 10:48:05 -07:00
parent 06fe2e23b0
commit c04097e491
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -119,9 +119,8 @@ pkgconf_exe = executable('pkgconf',
if get_option('tests') if get_option('tests')
kyua_exe = find_program('kyua') kyua_exe = find_program('kyua')
atf_sh_exe = find_program('atf-sh') atf_sh_exe = find_program('atf-sh')
test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile=' + join_paths(meson.current_build_dir(), 'Kyuafile'), '--build-root=' + meson.current_build_dir()]) 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()])
configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
subdir('tests') subdir('tests')
endif endif

4
tests/meson.build
View File

@ -18,6 +18,6 @@ tests = [
# yuck # yuck
foreach test : tests foreach test : tests
configure_file(input: test + '.sh', output: test, copy: true) test_file = configure_file(input: test + '.sh', output: test, copy: true)
run_command('chmod', '755', join_paths(meson.current_build_dir(), 'tests', test)) run_command('chmod', '755', test_file)
endforeach endforeach