Re: [libvirt] [PATCH v3 04/48] build: use a common rule for checking augeas test data files

Instead of each subdir containing its own custom rule for checking the augeas tests, use common rule for all. The new rule searches both src + build dirs for include files, since some augeas files will be auto-generated very shortly. Reviewed-by: Andrea Bolognani <abologna(a)redhat.com&gt; Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/Makefile.am | 18 +++++++++++++----- src/bhyve/Makefile.inc.am | 11 ----------- src/libxl/Makefile.inc.am | 11 ----------- src/locking/Makefile.inc.am | 34 ++-------------------------------- src/logging/Makefile.inc.am | 9 --------- src/lxc/Makefile.inc.am | 8 -------- src/qemu/Makefile.inc.am | 8 -------- src/remote/Makefile.inc.am | 8 -------- 8 files changed, 15 insertions(+), 92 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 938c119f39..6bb33524cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -74,7 +74,6 @@ GENERATED_SYM_FILES = augeas_DATA = augeastest_DATA = conf_DATA = -AUGEAS_DIRS = if WITH_DTRACE_PROBES tapset_DATA = endif WITH_DTRACE_PROBES @@ -397,13 +396,22 @@ GENERATED_SYM_FILES += \ - - - +AUG_TEST_NAMES = $(subst /,-, $(augeastest_DATA)) check-local: check-augeas -check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) +check-augeas: $(augeas_DATA) $(augeastest_DATA) + $(AM_V_GEN) \ + if test -x "$(AUGPARSE)"; then \ + for f in $(augeastest_DATA); do \ + DIR=$$(dirname "$$f"); \ + FILE=$$(basename "$$f"); \ + "$(AUGPARSE)" \ + -I "$(srcdir)/$$DIR" -I "$(builddir)/$$DIR" \ + "$$DIR/$$FILE"; \ + done; \ + fi +.PHONY: check-augeas