From nobody Sun Feb 8 12:18:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563897811; cv=none; d=zoho.com; s=zohoarc; b=kIhcNMPMRVyNKzh4AFpy5Ip9YtkUWQyDLgzs7VK5knJKKlqaQgnJ0otcDj0q5zRX33dy8vtmB1mUteLilPneU7RD5PqOYXpu1KdrtEwfjsT5zBK5bZMKdWCsAdPcTP8RQp7S5eHtN189LqIjS64ySuHDE7EZ2d4zXmDsUclmjFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563897811; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=49o+22Z1Ef+9S+qYLV5lT2FoHeRlurGdMTgGUms+fu8=; b=UszYuZkSr4E8+apTa7Wa6EVT/Jv486id1VwAO/aIF++FS0NdLX+a2DW46eD14SkZPJqYeLsMU+X4aRVz+mRMNlIiknoYiCdz+6VnJhZihuG/lttWJUpHuZZW+hBdLOdwlId0H6ahl3BRFF8485tlyvv6PeTQQ2+G0APWLPCkvVs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1563897811262532.8465845777913; Tue, 23 Jul 2019 09:03:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E7BB03001808; Tue, 23 Jul 2019 16:03:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B26F2101E670; Tue, 23 Jul 2019 16:03:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5F2B21800206; Tue, 23 Jul 2019 16:03:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6NG3QMD024494 for ; Tue, 23 Jul 2019 12:03:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id D9B195C25A; Tue, 23 Jul 2019 16:03:26 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.112.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9FA55C22D; Tue, 23 Jul 2019 16:03:25 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 23 Jul 2019 17:02:40 +0100 Message-Id: <20190723160319.18153-3-berrange@redhat.com> In-Reply-To: <20190723160319.18153-1-berrange@redhat.com> References: <20190723160319.18153-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/41] build: create all augeas test files in same dir as their source X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 23 Jul 2019 16:03:30 +0000 (UTC) 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=C3=A9 --- .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 =3D $(BHYVE_DRIVER= _SOURCES) =20 conf_DATA +=3D bhyve/bhyve.conf augeas_DATA +=3D bhyve/libvirtd_bhyve.aug -augeastest_DATA +=3D test_libvirtd_bhyve.aug +augeastest_DATA +=3D bhyve/test_libvirtd_bhyve.aug +CLEANFILES +=3D bhyve/test_libvirtd_bhyve.aug =20 AUGEAS_DIRS +=3D bhyve =20 -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 $< > $@ =20 -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 =20 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 =3D $(LIBXL_DRIVER= _SOURCES) =20 conf_DATA +=3D libxl/libxl.conf augeas_DATA +=3D libxl/libvirtd_libxl.aug -augeastest_DATA +=3D test_libvirtd_libxl.aug -CLEANFILES +=3D test_libvirtd_libxl.aug +augeastest_DATA +=3D libxl/test_libvirtd_libxl.aug +CLEANFILES +=3D libxl/test_libvirtd_libxl.aug =20 AUGEAS_DIRS +=3D libxl =20 -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 $< > $@ =20 -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 =20 INSTALL_DATA_DIRS +=3D 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 +=3D \ endif WITH_SASL =20 if WITH_QEMU -augeastest_DATA +=3D test_libvirt_lockd.aug -CLEANFILES +=3D test_libvirt_lockd.aug +augeastest_DATA +=3D locking/test_libvirt_lockd.aug +CLEANFILES +=3D locking/test_libvirt_lockd.aug nodist_conf_DATA +=3D locking/qemu-lockd.conf BUILT_SOURCES +=3D locking/qemu-lockd.conf DISTCLEANFILES +=3D locking/qemu-lockd.conf @@ -170,8 +170,8 @@ sanlock_la_LIBADD =3D -lsanlock_client libvirt.la ../gn= ulib/lib/libgnu.la augeas_DATA +=3D locking/libvirt_sanlock.aug =20 if WITH_QEMU -augeastest_DATA +=3D test_libvirt_sanlock.aug -CLEANFILES +=3D test_libvirt_sanlock.aug +augeastest_DATA +=3D locking/test_libvirt_sanlock.aug +CLEANFILES +=3D locking/test_libvirt_sanlock.aug nodist_conf_DATA +=3D locking/qemu-sanlock.conf BUILT_SOURCES +=3D locking/qemu-sanlock.conf DISTCLEANFILES +=3D locking/qemu-sanlock.conf @@ -203,8 +203,8 @@ man8_MANS +=3D virtlockd.8 conf_DATA +=3D locking/virtlockd.conf =20 augeas_DATA +=3D locking/virtlockd.aug -augeastest_DATA +=3D test_virtlockd.aug - +augeastest_DATA +=3D locking/test_virtlockd.aug +CLEANFILES +=3D locking/test_virtlockd.aug =20 INSTALL_DATA_DIRS +=3D locking =20 @@ -226,13 +226,13 @@ endif WITH_SANLOCK =20 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 $< > $@ =20 -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 =20 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 =20 -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 $< > $@ =20 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 =20 -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 =20 AUGEAS_DIRS +=3D 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 +=3D \ $(LOG_DAEMON_GENERATED) \ $(NULL) =20 -CLEANFILES +=3D test_virtlogd.aug +CLEANFILES +=3D logging/test_virtlogd.aug =20 PODFILES +=3D logging/virtlogd.pod MANINFILES +=3D virtlogd.8.in @@ -97,17 +97,18 @@ endif WITH_SASL conf_DATA +=3D logging/virtlogd.conf =20 augeas_DATA +=3D logging/virtlogd.aug -augeastest_DATA +=3D test_virtlogd.aug +augeastest_DATA +=3D logging/test_virtlogd.aug +CLEANFILES +=3D logging/test_virtlogd.aug =20 -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 $< > $@ =20 AUGEAS_DIRS +=3D logging =20 -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 =20 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 +=3D lxc/lxc.conf =20 augeas_DATA +=3D lxc/libvirtd_lxc.aug -augeastest_DATA +=3D test_libvirtd_lxc.aug -CLEANFILES +=3D test_libvirtd_lxc.aug +augeastest_DATA +=3D lxc/test_libvirtd_lxc.aug +CLEANFILES +=3D lxc/test_libvirtd_lxc.aug =20 AUGEAS_DIRS +=3D lxc =20 -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 $< > $@ =20 -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 =20 INSTALL_DATA_DIRS +=3D 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 +=3D qemu/qemu.conf =20 augeas_DATA +=3D qemu/libvirtd_qemu.aug -augeastest_DATA +=3D test_libvirtd_qemu.aug -CLEANFILES +=3D test_libvirtd_qemu.aug +augeastest_DATA +=3D qemu/test_libvirtd_qemu.aug +CLEANFILES +=3D qemu/test_libvirtd_qemu.aug =20 AUGEAS_DIRS +=3D qemu =20 -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 $< > $@ =20 -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 =20 INSTALL_DATA_DIRS +=3D 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 +=3D libvirtd =20 augeas_DATA +=3D remote/libvirtd.aug =20 -augeastest_DATA +=3D test_libvirtd.aug +augeastest_DATA +=3D remote/test_libvirtd.aug =20 conf_DATA +=3D remote/libvirtd.conf =20 -CLEANFILES +=3D test_libvirtd.aug +CLEANFILES +=3D remote/test_libvirtd.aug =20 man8_MANS +=3D libvirtd.8 =20 @@ -188,13 +188,13 @@ uninstall-data-remote: =20 AUGEAS_DIRS +=3D remote =20 -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 $< > $@ =20 -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 =20 if WITH_SYSCTL --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list