mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-09 22:45:21 +00:00
src/meson: introduce srcdir and builddir into augeas_test_data dictionary
This will be used later to specify different include directories for augparse binary to run augeas tests. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
bb11ca5199
commit
055cac9c5f
@ -689,6 +689,8 @@ endforeach
|
|||||||
# each entry is a dictionary with following items:
|
# each entry is a dictionary with following items:
|
||||||
# * name: daemon name to run the test for (required)
|
# * name: daemon name to run the test for (required)
|
||||||
# * file: test file to use (required)
|
# * file: test file to use (required)
|
||||||
|
# * srcdir: path to source dir with aug files (required)
|
||||||
|
# * builddir: path to build dir with aug files (required)
|
||||||
augeas_test_data = []
|
augeas_test_data = []
|
||||||
|
|
||||||
foreach data : virt_daemon_confs
|
foreach data : virt_daemon_confs
|
||||||
@ -753,7 +755,12 @@ foreach data : virt_daemon_confs
|
|||||||
install: true,
|
install: true,
|
||||||
install_dir: virt_test_aug_dir,
|
install_dir: virt_test_aug_dir,
|
||||||
)
|
)
|
||||||
augeas_test_data += { 'name': data['name'], 'file': augeas_test_file }
|
augeas_test_data += {
|
||||||
|
'name': data['name'],
|
||||||
|
'file': augeas_test_file,
|
||||||
|
'srcdir': meson.current_source_dir(),
|
||||||
|
'builddir': meson.current_build_dir(),
|
||||||
|
}
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
|
||||||
@ -960,8 +967,8 @@ if augparse_prog.found()
|
|||||||
'check-augeas-@0@'.format(data['name']),
|
'check-augeas-@0@'.format(data['name']),
|
||||||
augparse_prog,
|
augparse_prog,
|
||||||
args: [
|
args: [
|
||||||
'-I', meson.current_source_dir(),
|
'-I', data['srcdir'],
|
||||||
'-I', meson.current_build_dir(),
|
'-I', data['builddir'],
|
||||||
data['file'].full_path(),
|
data['file'].full_path(),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user