External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: src: generate libvirt daemon augeas test files

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-06-22 18:04:48 +02:00
parent 6e07b2ba49
commit 3225a20bb7
12 changed files with 40 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bhyve/Makefile.inc.am
View File

@ -31,10 +31,4 @@ bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \
-e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
> $@ || rm -f $@
augeastest_DATA += bhyve/test_libvirtd_bhyve.aug
bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
$(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@
endif WITH_BHYVE

5
src/bhyve/meson.build
View File

@ -46,4 +46,9 @@ if conf.has('WITH_BHYVE')
virt_conf_files += files('bhyve.conf')
virt_aug_files += files('libvirtd_bhyve.aug')
virt_test_aug_files += {
'name': 'test_libvirtd_bhyve.aug',
'aug': files('test_libvirtd_bhyve.aug.in'),
'conf': files('bhyve.conf'),
}
endif

6
src/libxl/Makefile.inc.am
View File

@ -71,12 +71,6 @@ libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \
-e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
> $@ || rm -f $@
augeastest_DATA += libxl/test_libvirtd_libxl.aug
libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
$(srcdir)/libxl/libxl.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@
INSTALL_DATA_DIRS += libxl
install-data-libxl:

5
src/libxl/meson.build
View File

@ -47,4 +47,9 @@ if conf.has('WITH_LIBXL')
virt_conf_files += files('libxl.conf')
virt_aug_files += files('libvirtd_libxl.aug')
virt_test_aug_files += {
'name': 'test_libvirtd_libxl.aug',
'aug': files('test_libvirtd_libxl.aug.in'),
'conf': files('libxl.conf'),
}
endif

32
src/locking/Makefile.inc.am
View File

@ -19,18 +19,6 @@ OPENRC_INIT_FILES_IN += \
locking/virtlockd.init.in \
$(NULL)
if WITH_LIBVIRTD
if WITH_QEMU
augeastest_DATA += locking/test_libvirt_lockd.aug
endif WITH_QEMU
if WITH_SANLOCK
if WITH_QEMU
augeastest_DATA += locking/test_libvirt_sanlock.aug
endif WITH_QEMU
endif WITH_SANLOCK
augeastest_DATA += locking/test_virtlockd.aug
INSTALL_DATA_DIRS += locking
install-data-locking:
@ -48,26 +36,6 @@ uninstall-data-locking:
if WITH_SANLOCK
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||:
endif WITH_SANLOCK
if WITH_SANLOCK
if WITH_QEMU
locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
locking/qemu-sanlock.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@
endif WITH_QEMU
endif WITH_SANLOCK
if WITH_QEMU
locking/test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
locking/qemu-lockd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@
endif WITH_QEMU
locking/test_virtlockd.aug: locking/test_virtlockd.aug.in \
locking/virtlockd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@
endif WITH_LIBVIRTD
.PHONY: \

15
src/locking/meson.build
View File

@ -155,6 +155,11 @@ if conf.has('WITH_LIBVIRTD')
copy: true,
)
virt_conf_files += qemu_lockd_conf
virt_test_aug_files += {
'name': 'test_libvirt_lockd.aug',
'aug' : files('test_libvirt_lockd.aug.in'),
'conf': qemu_lockd_conf,
}
endif
if conf.has('WITH_LIBXL')
@ -176,6 +181,11 @@ if conf.has('WITH_LIBVIRTD')
copy: true,
)
virt_conf_files += qemu_sanlock_conf
virt_test_aug_files += {
'name': 'test_libvirt_sanlock.aug',
'aug' : files('test_libvirt_sanlock.aug.in'),
'conf': qemu_sanlock_conf,
}
endif
if conf.has('WITH_LIBXL')
@ -190,4 +200,9 @@ if conf.has('WITH_LIBVIRTD')
virt_conf_files += files('virtlockd.conf')
virt_aug_files += files('virtlockd.aug')
virt_test_aug_files += {
'name': 'test_virtlockd.aug',
'aug': files('test_virtlockd.aug.in'),
'conf': files('virtlockd.conf'),
}
endif

9
src/logging/Makefile.inc.am
View File

@ -18,15 +18,6 @@ OPENRC_INIT_FILES_IN += \
logging/virtlogd.init.in \
$(NULL)
if WITH_LIBVIRTD
augeastest_DATA += logging/test_virtlogd.aug
logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \
logging/virtlogd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@
endif WITH_LIBVIRTD
virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@

5
src/logging/meson.build
View File

@ -73,6 +73,11 @@ if conf.has('WITH_LIBVIRTD')
virt_conf_files += files('virtlogd.conf')
virt_aug_files += files('virtlogd.aug')
virt_test_aug_files += {
'name': 'test_virtlogd.aug',
'aug': files('test_virtlogd.aug.in'),
'conf': files('virtlogd.conf'),
}
endif
log_inc_dir = include_directories('.')

6
src/lxc/Makefile.inc.am
View File

@ -77,12 +77,6 @@ if WITH_DTRACE_PROBES
RPC_PROBE_FILES += $(srcdir)/lxc/lxc_monitor_protocol.x
endif
augeastest_DATA += lxc/test_libvirtd_lxc.aug
lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
$(srcdir)/lxc/lxc.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@
INSTALL_DATA_DIRS += lxc
install-data-lxc:

5
src/lxc/meson.build
View File

@ -131,4 +131,9 @@ if conf.has('WITH_LXC')
virt_conf_files += files('lxc.conf')
virt_aug_files += files('libvirtd_lxc.aug')
virt_test_aug_files += {
'name': 'test_libvirtd_lxc.aug',
'aug': files('test_libvirtd_lxc.aug.in'),
'conf': files('lxc.conf'),
}
endif

6
src/qemu/Makefile.inc.am
View File

@ -66,12 +66,6 @@ qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \
-e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
> $@ || rm -f $@
augeastest_DATA += qemu/test_libvirtd_qemu.aug
qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
$(srcdir)/qemu/qemu.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@
INSTALL_DATA_DIRS += qemu
install-data-qemu:

5
src/qemu/meson.build
View File

@ -124,6 +124,11 @@ if conf.has('WITH_QEMU')
virt_conf_files += files('qemu.conf')
virt_aug_files += files('libvirtd_qemu.aug')
virt_test_aug_files += {
'name': 'test_libvirtd_qemu.aug',
'aug': files('test_libvirtd_qemu.aug.in'),
'conf': files('qemu.conf'),
}
virt_helpers += {
'name': 'virt-qemu-run',