External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-30 11:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: create all augeas test files in same dir as their source

Browse Source 
The current make rules are inconsistent about which directory the
augeas test files are created in. Put them all in the same dir as
their source.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-07-19 16:48:10 +01:00
parent ae6fd27533
commit 2cdabb1761
8 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -135,6 +135,7 @@
/src/libvirt_lxc /src/libvirt_lxc
/src/libvirtd /src/libvirtd
/src/libvirtd*.logrotate /src/libvirtd*.logrotate
/src/libxl/test_libvirtd_libxl.aug
/src/locking/libxl-lockd.conf /src/locking/libxl-lockd.conf
/src/locking/libxl-sanlock.conf /src/locking/libxl-sanlock.conf
/src/locking/lock_daemon_dispatch_stubs.h /src/locking/lock_daemon_dispatch_stubs.h
@ -142,8 +143,11 @@
/src/locking/qemu-lockd.conf /src/locking/qemu-lockd.conf
/src/locking/qemu-sanlock.conf /src/locking/qemu-sanlock.conf
/src/locking/test_libvirt_sanlock.aug /src/locking/test_libvirt_sanlock.aug
/src/locking/test_libvirt_lockd.aug
/src/locking/test_virtlockd.aug
/src/logging/log_daemon_dispatch_stubs.h /src/logging/log_daemon_dispatch_stubs.h
/src/logging/log_protocol.[ch] /src/logging/log_protocol.[ch]
/src/logging/test_virtlogd.aug
/src/lxc/lxc_controller_dispatch.h /src/lxc/lxc_controller_dispatch.h
/src/lxc/lxc_monitor_dispatch.h /src/lxc/lxc_monitor_dispatch.h
/src/lxc/lxc_monitor_protocol.c /src/lxc/lxc_monitor_protocol.c
@ -154,11 +158,10 @@
/src/remote/*_client_bodies.h /src/remote/*_client_bodies.h
/src/remote/*_protocol.[ch] /src/remote/*_protocol.[ch]
/src/remote/*_stubs.h /src/remote/*_stubs.h
/src/remote/test_libvirtd.aug
/src/rpc/virkeepaliveprotocol.[ch] /src/rpc/virkeepaliveprotocol.[ch]
/src/rpc/virnetprotocol.[ch] /src/rpc/virnetprotocol.[ch]
/src/test_libvirt*.aug /src/test*.aug
/src/test_virtlockd.aug
/src/test_virtlogd.aug
/src/util/virkeycodetable*.h /src/util/virkeycodetable*.h
/src/util/virkeynametable*.h /src/util/virkeynametable*.h
/src/virt-aa-helper /src/virt-aa-helper

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

@ -49,17 +49,17 @@ libvirt_driver_bhyve_impl_la_SOURCES = $(BHYVE_DRIVER_SOURCES)
conf_DATA += bhyve/bhyve.conf conf_DATA += bhyve/bhyve.conf
augeas_DATA += bhyve/libvirtd_bhyve.aug augeas_DATA += bhyve/libvirtd_bhyve.aug
augeastest_DATA += test_libvirtd_bhyve.aug augeastest_DATA += bhyve/test_libvirtd_bhyve.aug
AUGEAS_DIRS += bhyve AUGEAS_DIRS += bhyve
test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \ bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
$(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@
check-augeas-bhyve: test_libvirtd_bhyve.aug check-augeas-bhyve: bhyve/test_libvirtd_bhyve.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/bhyve test_libvirtd_bhyve.aug; \ '$(AUGPARSE)' -I $(srcdir)/bhyve bhyve/test_libvirtd_bhyve.aug; \
fi fi
endif WITH_BHYVE endif WITH_BHYVE

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

@ -67,17 +67,17 @@ libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
conf_DATA += libxl/libxl.conf conf_DATA += libxl/libxl.conf
augeas_DATA += libxl/libvirtd_libxl.aug augeas_DATA += libxl/libvirtd_libxl.aug
augeastest_DATA += test_libvirtd_libxl.aug augeastest_DATA += libxl/test_libvirtd_libxl.aug
AUGEAS_DIRS += libxl AUGEAS_DIRS += libxl
test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \ libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
$(srcdir)/libxl/libxl.conf $(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@
check-augeas-libxl: test_libvirtd_libxl.aug check-augeas-libxl: libxl/test_libvirtd_libxl.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/libxl test_libvirtd_libxl.aug; \ '$(AUGPARSE)' -I $(srcdir)/libxl libxl/test_libvirtd_libxl.aug; \
fi fi
INSTALL_DATA_DIRS += libxl INSTALL_DATA_DIRS += libxl

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

@ -114,7 +114,7 @@ lockd_la_CFLAGS += \
endif WITH_SASL endif WITH_SASL
if WITH_QEMU if WITH_QEMU
augeastest_DATA += test_libvirt_lockd.aug augeastest_DATA += locking/test_libvirt_lockd.aug
nodist_conf_DATA += locking/qemu-lockd.conf nodist_conf_DATA += locking/qemu-lockd.conf
BUILT_SOURCES += locking/qemu-lockd.conf BUILT_SOURCES += locking/qemu-lockd.conf
DISTCLEANFILES += locking/qemu-lockd.conf DISTCLEANFILES += locking/qemu-lockd.conf
@ -169,7 +169,7 @@ sanlock_la_LIBADD = -lsanlock_client libvirt.la ../gnulib/lib/libgnu.la
augeas_DATA += locking/libvirt_sanlock.aug augeas_DATA += locking/libvirt_sanlock.aug
if WITH_QEMU if WITH_QEMU
augeastest_DATA += test_libvirt_sanlock.aug augeastest_DATA += locking/test_libvirt_sanlock.aug
nodist_conf_DATA += locking/qemu-sanlock.conf nodist_conf_DATA += locking/qemu-sanlock.conf
BUILT_SOURCES += locking/qemu-sanlock.conf BUILT_SOURCES += locking/qemu-sanlock.conf
DISTCLEANFILES += locking/qemu-sanlock.conf DISTCLEANFILES += locking/qemu-sanlock.conf
@ -201,8 +201,7 @@ man8_MANS += virtlockd.8
conf_DATA += locking/virtlockd.conf conf_DATA += locking/virtlockd.conf
augeas_DATA += locking/virtlockd.aug augeas_DATA += locking/virtlockd.aug
augeastest_DATA += test_virtlockd.aug augeastest_DATA += locking/test_virtlockd.aug
INSTALL_DATA_DIRS += locking INSTALL_DATA_DIRS += locking
@ -224,13 +223,13 @@ endif WITH_SANLOCK
if WITH_SANLOCK if WITH_SANLOCK
if WITH_QEMU if WITH_QEMU
test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
locking/qemu-sanlock.conf $(AUG_GENTEST) locking/qemu-sanlock.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@
check-augeas-sanlock: test_libvirt_sanlock.aug check-augeas-sanlock: locking/test_libvirt_sanlock.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \ '$(AUGPARSE)' -I $(srcdir)/locking locking/test_libvirt_sanlock.aug; \
fi fi
else ! WITH_QEMU else ! WITH_QEMU
check-augeas-sanlock: check-augeas-sanlock:
@ -240,29 +239,27 @@ check-augeas-sanlock:
endif ! WITH_SANLOCK endif ! WITH_SANLOCK
if WITH_QEMU if WITH_QEMU
test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \ locking/test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
locking/qemu-lockd.conf $(AUG_GENTEST) locking/qemu-lockd.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@
else ! WITH_QEMU endif WITH_QEMU
test_libvirt_lockd.aug:
endif ! WITH_QEMU
test_virtlockd.aug: locking/test_virtlockd.aug.in \ locking/test_virtlockd.aug: locking/test_virtlockd.aug.in \
locking/virtlockd.conf $(AUG_GENTEST) locking/virtlockd.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@
if WITH_QEMU if WITH_QEMU
check-augeas-lockd: test_libvirt_lockd.aug check-augeas-lockd: locking/test_libvirt_lockd.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_lockd.aug; \ '$(AUGPARSE)' -I $(srcdir)/locking locking/test_libvirt_lockd.aug; \
fi fi
else ! WITH_QEMU else ! WITH_QEMU
check-augeas-lockd: check-augeas-lockd:
endif ! WITH_QEMU endif ! WITH_QEMU
check-augeas-virtlockd: test_virtlockd.aug check-augeas-virtlockd: locking/test_virtlockd.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ '$(AUGPARSE)' -I $(srcdir)/locking locking/test_virtlockd.aug; \
fi fi
AUGEAS_DIRS += locking AUGEAS_DIRS += locking

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

@ -95,17 +95,17 @@ endif WITH_SASL
conf_DATA += logging/virtlogd.conf conf_DATA += logging/virtlogd.conf
augeas_DATA += logging/virtlogd.aug augeas_DATA += logging/virtlogd.aug
augeastest_DATA += test_virtlogd.aug augeastest_DATA += logging/test_virtlogd.aug
test_virtlogd.aug: logging/test_virtlogd.aug.in \ logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \
logging/virtlogd.conf $(AUG_GENTEST) logging/virtlogd.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@
AUGEAS_DIRS += logging AUGEAS_DIRS += logging
check-augeas-logging: test_virtlogd.aug check-augeas-logging: logging/test_virtlogd.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \ '$(AUGPARSE)' -I $(srcdir)/logging logging/test_virtlogd.aug; \
fi fi
endif WITH_LIBVIRTD endif WITH_LIBVIRTD

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

@ -156,17 +156,17 @@ endif
conf_DATA += lxc/lxc.conf conf_DATA += lxc/lxc.conf
augeas_DATA += lxc/libvirtd_lxc.aug augeas_DATA += lxc/libvirtd_lxc.aug
augeastest_DATA += test_libvirtd_lxc.aug augeastest_DATA += lxc/test_libvirtd_lxc.aug
AUGEAS_DIRS += lxc AUGEAS_DIRS += lxc
test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
$(srcdir)/lxc/lxc.conf $(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@
check-augeas-lxc: test_libvirtd_lxc.aug check-augeas-lxc: lxc/test_libvirtd_lxc.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \ '$(AUGPARSE)' -I $(srcdir)/lxc lxc/test_libvirtd_lxc.aug; \
fi fi
INSTALL_DATA_DIRS += lxc INSTALL_DATA_DIRS += lxc

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

@ -115,17 +115,17 @@ endif WITH_DTRACE_PROBES
conf_DATA += qemu/qemu.conf conf_DATA += qemu/qemu.conf
augeas_DATA += qemu/libvirtd_qemu.aug augeas_DATA += qemu/libvirtd_qemu.aug
augeastest_DATA += test_libvirtd_qemu.aug augeastest_DATA += qemu/test_libvirtd_qemu.aug
AUGEAS_DIRS += qemu AUGEAS_DIRS += qemu
test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \ qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
$(srcdir)/qemu/qemu.conf $(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@
check-augeas-qemu: test_libvirtd_qemu.aug check-augeas-qemu: qemu/test_libvirtd_qemu.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/qemu test_libvirtd_qemu.aug; \ '$(AUGPARSE)' -I $(srcdir)/qemu qemu/test_libvirtd_qemu.aug; \
fi fi
INSTALL_DATA_DIRS += qemu INSTALL_DATA_DIRS += qemu

8
src/remote/Makefile.inc.am
View File

@ -126,7 +126,7 @@ sbin_PROGRAMS += libvirtd
augeas_DATA += remote/libvirtd.aug augeas_DATA += remote/libvirtd.aug
augeastest_DATA += test_libvirtd.aug augeastest_DATA += remote/test_libvirtd.aug
conf_DATA += remote/libvirtd.conf conf_DATA += remote/libvirtd.conf
@ -186,13 +186,13 @@ uninstall-data-remote:
AUGEAS_DIRS += remote AUGEAS_DIRS += remote
test_libvirtd.aug: remote/test_libvirtd.aug.in \ remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
remote/libvirtd.conf $(AUG_GENTEST) remote/libvirtd.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< > $@
check-augeas-remote: test_libvirtd.aug check-augeas-remote: remote/test_libvirtd.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/remote test_libvirtd.aug; \ '$(AUGPARSE)' -I $(srcdir)/remote remote/test_libvirtd.aug; \
fi fi
if WITH_SYSCTL if WITH_SYSCTL