From nobody Sun Apr 28 05:10:08 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531938066410897.2366414264477; Wed, 18 Jul 2018 11:21:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F00A8307C701; Wed, 18 Jul 2018 18:20:57 +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 7F393600C6; Wed, 18 Jul 2018 18:20:56 +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 55C0018037ED; Wed, 18 Jul 2018 18:20:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6IIKoAf028829 for ; Wed, 18 Jul 2018 14:20:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1A552111CA1C; Wed, 18 Jul 2018 18:20:50 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8079D111CA1A; Wed, 18 Jul 2018 18:20:47 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 18 Jul 2018 19:20:46 +0100 Message-Id: <20180718182046.20364-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] locking: don't create qemu-sanlock.conf file when QEMU isn't enabled 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 18 Jul 2018 18:21:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The test targets result in the qemu-sanlock.conf file being created when sanlock is enabled, even if QEMU is not enabled. As a result it never gets cleaned up when distclean is run, breaking distcheck. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/locking/Makefile.inc.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Pushed as a build fix for when jansson isn't available (which turns off QEMU) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 649c769e00..f2eb2efb7b 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -156,10 +156,10 @@ sanlock_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) sanlock_la_LIBADD =3D -lsanlock_client libvirt.la ../gnulib/lib/libgnu.la =20 augeas_DATA +=3D locking/libvirt_sanlock.aug -augeastest_DATA +=3D test_libvirt_sanlock.aug -CLEANFILES +=3D test_libvirt_sanlock.aug =20 if WITH_QEMU +augeastest_DATA +=3D test_libvirt_sanlock.aug +CLEANFILES +=3D 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 @@ -213,6 +213,7 @@ if WITH_SANLOCK endif WITH_SANLOCK =20 if WITH_SANLOCK +if WITH_QEMU 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 $< $@ @@ -221,6 +222,9 @@ check-augeas-sanlock: test_libvirt_sanlock.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \ fi +else ! WITH_QEMU +check-augeas-sanlock: +endif ! WITH_QEMU else ! WITH_SANLOCK check-augeas-sanlock: endif ! WITH_SANLOCK --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list