From nobody Thu Apr 18 16:09:13 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 ARC-Seal: i=1; a=rsa-sha256; t=1560338400; cv=none; d=zoho.com; s=zohoarc; b=c/hMbl3hypWhHBiEOSyaMT9Btiv6FGADJ2dOrTKp87aQD34qgLqFWw1izcSms3lpS0CqZiVRZbUw+tEtbsqewHVlXKSEbhqKezCSprZ8zseG4PI2l7T0T6+zBiQScwU6IFTE4p2k9tfG2Fnu3EXIcZiaM/z3HgD9DktijJjEXeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560338400; 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=EIp/ITYkToE9S1XNgxCx8pvc+x6VB0xrSuQAoGKRcXs=; b=HY4qaQ9Ful3Z9EwyiYxphhyax7jZqDeTynTyXL68P5reMUN82eXrQPT+hC42flIlNRweE1OWLb7se5/WqtC61GLRdMQHWgjY+gW1vfr79f7/vnvQGNdt30zzAU/oaaRyT/m800v1dR81SI3v1mt/3cuafIt3HeG1GMOz1rZ7zyQ= 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 1560338400907485.52578809517615; Wed, 12 Jun 2019 04:20:00 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CE58E356F6; Wed, 12 Jun 2019 11:19:46 +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 27FE427BDB; Wed, 12 Jun 2019 11:19:44 +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 DB5DB1806B1A; Wed, 12 Jun 2019 11:19:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5CBJYvW025301 for ; Wed, 12 Jun 2019 07:19:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 667C71712D; Wed, 12 Jun 2019 11:19:34 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E4D1A377B for ; Wed, 12 Jun 2019 11:19:33 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 12 Jun 2019 13:19:27 +0200 Message-Id: <20190612111929.28748-2-abologna@redhat.com> In-Reply-To: <20190612111929.28748-1-abologna@redhat.com> References: <20190612111929.28748-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] tests: Tweak cputest_LDADDS 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-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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 12 Jun 2019 11:19:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We want have all test programs using qemu_LDADDS also use LDADDS, and cputest is the only existing exception. We can't just replace GNULIB_LIBS with LDADDS though, even though the latter is a superset of the former, because that would result in a linking error due to including the same object twice: /usr/bin/ld: ../src/libvirt_probes.o:.../src/libvirt_probes.o.dtrace-temp.c:141: multiple definition of `libvirt_object_new_semaphore'; ../src/libvirt_probes.o:.../src/libvirt_probes.o.dtrace-temp.c:141: first defined here To work around this, we include both qemu_LDADDS and LDADDS when QEMU support is enabled, and just LDADDS otherwise. Signed-off-by: Andrea Bolognani Reviewed-by: Jim Fehlig --- tests/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 6b17d99501..c34cfba34c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -962,11 +962,13 @@ interfacexml2xmltest_LDADD =3D $(LDADDS) cputest_SOURCES =3D \ cputest.c \ testutils.c testutils.h -cputest_LDADD =3D $(LDADDS) $(LIBXML_LIBS) +cputest_LDADD =3D $(LIBXML_LIBS) if WITH_QEMU cputest_SOURCES +=3D testutilsqemu.c testutilsqemu.h -cputest_LDADD +=3D libqemumonitortestutils.la $(qemu_LDADDS) $(GNULIB_LIBS) -endif WITH_QEMU +cputest_LDADD +=3D libqemumonitortestutils.la $(qemu_LDADDS) $(LDADDS) +else ! WITH_QEMU +cputest_LDADD +=3D $(LDADDS) +endif ! WITH_QEMU =20 metadatatest_SOURCES =3D \ metadatatest.c \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 18 16:09:13 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 ARC-Seal: i=1; a=rsa-sha256; t=1560338442; cv=none; d=zoho.com; s=zohoarc; b=iDDqgQ2M6TQUsP6sicOo/AFc31fZG6KMG1oqan4NWwYEj7e758SMrhSBCZNxvEkMOSwcBdJPI6TFiHIF6Er5OP7wI3MoTYkODimju8s/8NpRJpNF08dKz87fwENkfbAhCLEoW2HCnfk2ufT2u8MWtXY9qw7lvEilGwnUulmfviM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560338442; 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=r34frCHwitVbNhquoIDtF7/i2rgnoSRKzcnCA0eGWKY=; b=AtC7Q5LgQIerJbYruLLi3Rhp04UxT1Ng6AIUJ60vOl3FtZqOCsrLuv0WgVbXGKFSxY1OGGz63Xe0GzmWLvgMhuCz5fGv6hRYE8KQ7gB3E9wjVmOTLmLBgWVYKREE8br7HNuugE3xUXs5U/VrcKdOzypRxvg9vV4uF7Clp+QD2IY= 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 1560338442619915.2539780572755; Wed, 12 Jun 2019 04:20:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A25D8A004; Wed, 12 Jun 2019 11:20:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A8C3648D7; Wed, 12 Jun 2019 11:20:35 +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 0B9434EBD7; Wed, 12 Jun 2019 11:20:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5CBJZJK025311 for ; Wed, 12 Jun 2019 07:19:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 336EB1712D; Wed, 12 Jun 2019 11:19:35 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B2325377B for ; Wed, 12 Jun 2019 11:19:34 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 12 Jun 2019 13:19:28 +0200 Message-Id: <20190612111929.28748-3-abologna@redhat.com> In-Reply-To: <20190612111929.28748-1-abologna@redhat.com> References: <20190612111929.28748-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] tests: Tweak vircapstest_LDADD 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-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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 12 Jun 2019 11:20:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We optionally include QEMU and LXC support in this test and depending on which is enabled (if either is enabled at all) we need to link in different objects. Right now we implicitly depend on the fact that qemu_LDADDS is empty when QEMU is not enabled to get the correct set of objects, but it's better to be explicit about it. Signed-off-by: Andrea Bolognani Reviewed-by: Jim Fehlig --- tests/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index c34cfba34c..f9dbf9a0f6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1029,7 +1029,11 @@ endif WITH_LXC if WITH_QEMU vircapstest_SOURCES +=3D testutilsqemu.c testutilsqemu.h endif WITH_QEMU +if WITH_QEMU vircapstest_LDADD =3D $(qemu_LDADDS) $(LDADDS) +else ! WITH_QEMU +vircapstest_LDADD =3D $(LDADDS) +endif ! WITH_QEMU =20 domaincapsmock_la_SOURCES =3D domaincapsmock.c domaincapsmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 18 16:09:13 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 ARC-Seal: i=1; a=rsa-sha256; t=1560338409; cv=none; d=zoho.com; s=zohoarc; b=BHBGVvesElPUf7qBy12tIOrPoO5TlaX6rRyU+u3DU8DVummYQt5/+JMDJd7KCRJA7KMyW4XxTs0oseOHq+XtQf1GmNe2NHfxV8Zt0VE2SbYsTidxYwFeGHDyp9ImYDDyJ5FHCX2KiBPfDSpI468QF0GphBRe4QLRmFpRhjJx7j4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560338409; 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=fVjsRd6KDhRLyvdG6EzKRPjWaqpKUaRWrjedrJXOS+I=; b=RS0DldhbySy6Ri81lUdqwAEESKhvU/J7tz96W3YDKQ+7sriVAnfZgpIboEZX2+1FOxIFZ1jHMfRpXGrSPWjah9zP7ARRGn5Qq6bJDHioZrOZr369y8J1wBhd9Z9mi/cT2+aiL+DJjnYWdtuO4xBBBJM47NhoRULJssjFrMTxTkY= 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 156033840991947.73375224058873; Wed, 12 Jun 2019 04:20:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 681F9308FC4B; Wed, 12 Jun 2019 11:19:52 +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 486F1377B; Wed, 12 Jun 2019 11:19:44 +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 5E3001806B19; Wed, 12 Jun 2019 11:19:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5CBJaIM025319 for ; Wed, 12 Jun 2019 07:19:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 001451712D; Wed, 12 Jun 2019 11:19:36 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F54B377B for ; Wed, 12 Jun 2019 11:19:35 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 12 Jun 2019 13:19:29 +0200 Message-Id: <20190612111929.28748-4-abologna@redhat.com> In-Reply-To: <20190612111929.28748-1-abologna@redhat.com> References: <20190612111929.28748-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] tests: Include LDADDS in qemu_LDADDS 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-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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 12 Jun 2019 11:20:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" At this point, all test programs that use qemu_LDADDS also use LDADDS, so we can remove a bunch of repetition by simply including the latter in the former. Signed-off-by: Andrea Bolognani Reviewed-by: Jim Fehlig --- tests/Makefile.am | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index f9dbf9a0f6..5ba529124a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -554,10 +554,11 @@ endif WITH_STORAGE if WITH_DTRACE_PROBES qemu_LDADDS +=3D ../src/libvirt_qemu_probes.lo endif WITH_DTRACE_PROBES +qemu_LDADDS +=3D $(LDADDS) =20 libqemutestdriver_la_SOURCES =3D libqemutestdriver_la_LDFLAGS =3D $(DRIVERLIB_LDFLAGS) -libqemutestdriver_la_LIBADD =3D $(qemu_LDADDS) $(LDADDS) +libqemutestdriver_la_LIBADD =3D $(qemu_LDADDS) =20 qemucpumock_la_SOURCES =3D \ qemucpumock.c testutilshostcpus.h @@ -580,7 +581,7 @@ qemuxml2argvmock_la_LIBADD =3D $(MOCKLIBS_LIBS) qemuxml2xmltest_SOURCES =3D \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuxml2xmltest_LDADD =3D $(qemu_LDADDS) $(LDADDS) +qemuxml2xmltest_LDADD =3D $(qemu_LDADDS) =20 qemuargv2xmltest_SOURCES =3D \ qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \ @@ -594,7 +595,7 @@ qemumonitorjsontest_SOURCES =3D \ testutilsqemu.c testutilsqemu.h \ $(NULL) qemumonitorjsontest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) $(LDADDS) + $(qemu_LDADDS) =20 qemucapabilitiestest_SOURCES =3D \ qemucapabilitiestest.c \ @@ -602,7 +603,7 @@ qemucapabilitiestest_SOURCES =3D \ testutilsqemu.c testutilsqemu.h \ $(NULL) qemucapabilitiestest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) $(LDADDS) + $(qemu_LDADDS) =20 qemucapsprobe_SOURCES =3D \ qemucapsprobe.c @@ -620,14 +621,14 @@ qemucommandutiltest_SOURCES =3D \ testutilsqemu.c testutilsqemu.h \ $(NULL) qemucommandutiltest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) $(LDADDS) + $(qemu_LDADDS) =20 qemucaps2xmltest_SOURCES =3D \ qemucaps2xmltest.c \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemucaps2xmltest_LDADD =3D $(qemu_LDADDS) $(LDADDS) +qemucaps2xmltest_LDADD =3D $(qemu_LDADDS) =20 qemucaps2xmlmock_la_SOURCES =3D \ qemucaps2xmlmock.c @@ -639,14 +640,14 @@ qemuagenttest_SOURCES =3D \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemuagenttest_LDADD =3D libqemumonitortestutils.la $(qemu_LDADDS) $(LDADDS) +qemuagenttest_LDADD =3D libqemumonitortestutils.la $(qemu_LDADDS) =20 qemuhotplugtest_SOURCES =3D \ qemuhotplugtest.c \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemuhotplugtest_LDADD =3D libqemumonitortestutils.la $(qemu_LDADDS) $(LDAD= DS) +qemuhotplugtest_LDADD =3D libqemumonitortestutils.la $(qemu_LDADDS) =20 qemublocktest_SOURCES =3D \ qemublocktest.c \ @@ -658,19 +659,18 @@ qemublocktest_LDADD =3D \ ../src/libvirt_conf.la \ ../src/libvirt_util.la \ $(qemu_LDADDS) \ - $(LDADDS) \ $(NULL) =20 domainsnapshotxml2xmltest_SOURCES =3D \ domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -domainsnapshotxml2xmltest_LDADD =3D $(qemu_LDADDS) $(LDADDS) +domainsnapshotxml2xmltest_LDADD =3D $(qemu_LDADDS) =20 qemumemlocktest_SOURCES =3D \ qemumemlocktest.c \ testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemumemlocktest_LDADD =3D $(qemu_LDADDS) $(LDADDS) +qemumemlocktest_LDADD =3D $(qemu_LDADDS) =20 qemumigparamstest_SOURCES =3D \ qemumigparamstest.c \ @@ -678,21 +678,21 @@ qemumigparamstest_SOURCES =3D \ testutilsqemu.c testutilsqemu.h \ $(NULL) qemumigparamstest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) $(LDADDS) + $(qemu_LDADDS) =20 qemusecuritytest_SOURCES =3D \ qemusecuritytest.c qemusecuritytest.h \ qemusecuritymock.c \ testutils.h testutils.c \ testutilsqemu.h testutilsqemu.c -qemusecuritytest_LDADD =3D $(qemu_LDADDS) $(LDADDS) +qemusecuritytest_LDADD =3D $(qemu_LDADDS) =20 qemufirmwaretest_SOURCES =3D \ qemufirmwaretest.c \ testutils.h testutils.c \ virfilewrapper.c virfilewrapper.h \ $(NULL) -qemufirmwaretest_LDADD =3D $(qemu_LDADDS) $(LDADDS) +qemufirmwaretest_LDADD =3D $(qemu_LDADDS) =20 else ! WITH_QEMU EXTRA_DIST +=3D qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ @@ -965,7 +965,7 @@ cputest_SOURCES =3D \ cputest_LDADD =3D $(LIBXML_LIBS) if WITH_QEMU cputest_SOURCES +=3D testutilsqemu.c testutilsqemu.h -cputest_LDADD +=3D libqemumonitortestutils.la $(qemu_LDADDS) $(LDADDS) +cputest_LDADD +=3D libqemumonitortestutils.la $(qemu_LDADDS) else ! WITH_QEMU cputest_LDADD +=3D $(LDADDS) endif ! WITH_QEMU @@ -1030,7 +1030,7 @@ if WITH_QEMU vircapstest_SOURCES +=3D testutilsqemu.c testutilsqemu.h endif WITH_QEMU if WITH_QEMU -vircapstest_LDADD =3D $(qemu_LDADDS) $(LDADDS) +vircapstest_LDADD =3D $(qemu_LDADDS) else ! WITH_QEMU vircapstest_LDADD =3D $(LDADDS) endif ! WITH_QEMU @@ -1404,7 +1404,7 @@ if WITH_QEMU securityselinuxlabeltest_SOURCES =3D \ securityselinuxlabeltest.c testutils.h testutils.c \ testutilsqemu.h testutilsqemu.c -securityselinuxlabeltest_LDADD =3D $(qemu_LDADDS) $(LDADDS) $(SELINUX_LIBS) +securityselinuxlabeltest_LDADD =3D $(qemu_LDADDS) $(SELINUX_LIBS) securityselinuxlabeltest_DEPENDENCIES =3D libsecurityselinuxhelper.la \ ../src/libvirt.la endif WITH_QEMU --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list