[libvirt] [PATCH 02/41] build: create all augeas test files in same dir as their source

Daniel P. Berrangé berrange at redhat.com
Tue Jul 23 16:02:40 UTC 2019 

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.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 .gitignore                  |  8 +++++---
 src/bhyve/Makefile.inc.am   |  9 +++++----
 src/libxl/Makefile.inc.am   | 10 +++++-----
 src/locking/Makefile.inc.am | 34 ++++++++++++++++------------------
 src/logging/Makefile.inc.am | 11 ++++++-----
 src/lxc/Makefile.inc.am     | 10 +++++-----
 src/qemu/Makefile.inc.am    | 10 +++++-----
 src/remote/Makefile.inc.am  | 10 +++++-----
 8 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/.gitignore b/.gitignore
index 727bfdb6ec..d75b24c743 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,6 +135,7 @@
 /src/libvirt_lxc
 /src/libvirtd
 /src/libvirtd*.logrotate
+/src/libxl/test_libvirtd_libxl.aug
 /src/locking/libxl-lockd.conf
 /src/locking/libxl-sanlock.conf
 /src/locking/lock_daemon_dispatch_stubs.h
@@ -142,8 +143,11 @@
 /src/locking/qemu-lockd.conf
 /src/locking/qemu-sanlock.conf
 /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_protocol.[ch]
+/src/logging/test_virtlogd.aug
 /src/lxc/lxc_controller_dispatch.h
 /src/lxc/lxc_monitor_dispatch.h
 /src/lxc/lxc_monitor_protocol.c
@@ -154,11 +158,9 @@
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]
 /src/remote/*_stubs.h
+/src/remote/test_libvirtd.aug
 /src/rpc/virkeepaliveprotocol.[ch]
 /src/rpc/virnetprotocol.[ch]
-/src/test_libvirt*.aug
-/src/test_virtlockd.aug
-/src/test_virtlogd.aug
 /src/util/virkeycodetable*.h
 /src/util/virkeynametable*.h
 /src/virt-aa-helper
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 6e8e6ad5d8..d9cc64a827 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -49,17 +49,18 @@ libvirt_driver_bhyve_impl_la_SOURCES = $(BHYVE_DRIVER_SOURCES)
 
 conf_DATA += bhyve/bhyve.conf
 augeas_DATA += bhyve/libvirtd_bhyve.aug
-augeastest_DATA += test_libvirtd_bhyve.aug
+augeastest_DATA += bhyve/test_libvirtd_bhyve.aug
+CLEANFILES += bhyve/test_libvirtd_bhyve.aug
 
 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)
 	$(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 \
-	    '$(AUGPARSE)' -I $(srcdir)/bhyve test_libvirtd_bhyve.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/bhyve bhyve/test_libvirtd_bhyve.aug; \
 	fi
 
 endif WITH_BHYVE
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index abc65ede2c..1abdeff390 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -67,18 +67,18 @@ libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
 
 conf_DATA += libxl/libxl.conf
 augeas_DATA += libxl/libvirtd_libxl.aug
-augeastest_DATA += test_libvirtd_libxl.aug
-CLEANFILES += test_libvirtd_libxl.aug
+augeastest_DATA += libxl/test_libvirtd_libxl.aug
+CLEANFILES += libxl/test_libvirtd_libxl.aug
 
 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)
 	$(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 \
-	    '$(AUGPARSE)' -I $(srcdir)/libxl test_libvirtd_libxl.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/libxl libxl/test_libvirtd_libxl.aug; \
 	fi
 
 INSTALL_DATA_DIRS += libxl
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index c44f74a529..8041ae89b8 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -114,8 +114,8 @@ lockd_la_CFLAGS += \
 endif WITH_SASL
 
 if WITH_QEMU
-augeastest_DATA += test_libvirt_lockd.aug
-CLEANFILES += test_libvirt_lockd.aug
+augeastest_DATA += locking/test_libvirt_lockd.aug
+CLEANFILES += locking/test_libvirt_lockd.aug
 nodist_conf_DATA += locking/qemu-lockd.conf
 BUILT_SOURCES += locking/qemu-lockd.conf
 DISTCLEANFILES += locking/qemu-lockd.conf
@@ -170,8 +170,8 @@ sanlock_la_LIBADD = -lsanlock_client libvirt.la ../gnulib/lib/libgnu.la
 augeas_DATA += locking/libvirt_sanlock.aug
 
 if WITH_QEMU
-augeastest_DATA += test_libvirt_sanlock.aug
-CLEANFILES += test_libvirt_sanlock.aug
+augeastest_DATA += locking/test_libvirt_sanlock.aug
+CLEANFILES += locking/test_libvirt_sanlock.aug
 nodist_conf_DATA += locking/qemu-sanlock.conf
 BUILT_SOURCES += locking/qemu-sanlock.conf
 DISTCLEANFILES += locking/qemu-sanlock.conf
@@ -203,8 +203,8 @@ man8_MANS += virtlockd.8
 conf_DATA += locking/virtlockd.conf
 
 augeas_DATA += locking/virtlockd.aug
-augeastest_DATA += test_virtlockd.aug
-
+augeastest_DATA += locking/test_virtlockd.aug
+CLEANFILES += locking/test_virtlockd.aug
 
 INSTALL_DATA_DIRS += locking
 
@@ -226,13 +226,13 @@ endif WITH_SANLOCK
 
 if WITH_SANLOCK
 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)
 	$(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 \
-	    '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_libvirt_sanlock.aug; \
 	fi
 else ! WITH_QEMU
 check-augeas-sanlock:
@@ -242,29 +242,27 @@ check-augeas-sanlock:
 endif ! WITH_SANLOCK
 
 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)
 	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@
-else ! WITH_QEMU
-test_libvirt_lockd.aug:
-endif ! WITH_QEMU
+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)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@
 
 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 \
-	    '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_lockd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_libvirt_lockd.aug; \
 	fi
 else ! WITH_QEMU
 check-augeas-lockd:
 endif ! WITH_QEMU
 
-check-augeas-virtlockd: test_virtlockd.aug
+check-augeas-virtlockd: locking/test_virtlockd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_virtlockd.aug; \
 	fi
 
 AUGEAS_DIRS += locking
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index 8527890eb0..7e8391b3cc 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -46,7 +46,7 @@ MAINTAINERCLEANFILES += \
 	$(LOG_DAEMON_GENERATED) \
 	$(NULL)
 
-CLEANFILES += test_virtlogd.aug
+CLEANFILES += logging/test_virtlogd.aug
 
 PODFILES += logging/virtlogd.pod
 MANINFILES += virtlogd.8.in
@@ -97,17 +97,18 @@ endif WITH_SASL
 conf_DATA += logging/virtlogd.conf
 
 augeas_DATA += logging/virtlogd.aug
-augeastest_DATA += test_virtlogd.aug
+augeastest_DATA += logging/test_virtlogd.aug
+CLEANFILES += 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)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@
 
 AUGEAS_DIRS += logging
 
-check-augeas-logging: test_virtlogd.aug
+check-augeas-logging: logging/test_virtlogd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/logging logging/test_virtlogd.aug; \
 	fi
 
 endif WITH_LIBVIRTD
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 1c0b715a2f..b7f539b878 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -156,18 +156,18 @@ endif
 conf_DATA += lxc/lxc.conf
 
 augeas_DATA += lxc/libvirtd_lxc.aug
-augeastest_DATA += test_libvirtd_lxc.aug
-CLEANFILES += test_libvirtd_lxc.aug
+augeastest_DATA += lxc/test_libvirtd_lxc.aug
+CLEANFILES += lxc/test_libvirtd_lxc.aug
 
 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)
 	$(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 \
-	    '$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/lxc lxc/test_libvirtd_lxc.aug; \
 	fi
 
 INSTALL_DATA_DIRS += lxc
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index e8c7d4b5b1..464bbfe735 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -115,18 +115,18 @@ endif WITH_DTRACE_PROBES
 conf_DATA += qemu/qemu.conf
 
 augeas_DATA += qemu/libvirtd_qemu.aug
-augeastest_DATA += test_libvirtd_qemu.aug
-CLEANFILES += test_libvirtd_qemu.aug
+augeastest_DATA += qemu/test_libvirtd_qemu.aug
+CLEANFILES += qemu/test_libvirtd_qemu.aug
 
 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)
 	$(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 \
-	    '$(AUGPARSE)' -I $(srcdir)/qemu test_libvirtd_qemu.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/qemu qemu/test_libvirtd_qemu.aug; \
 	fi
 
 INSTALL_DATA_DIRS += qemu
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 4f706f9743..4a1d89ee17 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -126,11 +126,11 @@ sbin_PROGRAMS += libvirtd
 
 augeas_DATA += remote/libvirtd.aug
 
-augeastest_DATA += test_libvirtd.aug
+augeastest_DATA += remote/test_libvirtd.aug
 
 conf_DATA += remote/libvirtd.conf
 
-CLEANFILES += test_libvirtd.aug
+CLEANFILES += remote/test_libvirtd.aug
 
 man8_MANS += libvirtd.8
 
@@ -188,13 +188,13 @@ uninstall-data-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)
 	$(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 \
-	    '$(AUGPARSE)' -I $(srcdir)/remote test_libvirtd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/remote remote/test_libvirtd.aug; \
 	fi
 
 if WITH_SYSCTL
-- 
2.21.0

More information about the libvir-list mailing list