From nobody Sun Feb 8 11:59:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1594894703; cv=none; d=zohomail.com; s=zohoarc; b=eDY95oWslqf5qcZn+8hYAZAnozaMzViv+4ImiqD1n0BNjoiDE2ANas9R1Qg1RGOoOXzrSnb8pvnSnPciCycFCVMITIKQaOtOhjRr2VpHwPWXUH74jrpfGyFlfl4/Jfy7t0LXqEJu3hInlsvcNixzbl20zGjDPp7cnxos4VdhNN4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894703; 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; bh=MON3v3If4rzp7NkL9iguujHmfw1vMmtzTuQrvRZwyHI=; b=LFXShRfpW7XjLi0rwpEr0GeFy5i+JVWfcFRc7cSAFcnobKY8WDFpriFlx7UXznpHUSppSUfJOjjuPaJa4RP1ji8TUyS4kMNhFPBzI766PlNV8whk+bVD7j52ag1Sc8rtBEN+l428FYmRr0NNcpXvMla1phZAcLpp4UpwOM15OVY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894703297782.7388692020088; Thu, 16 Jul 2020 03:18:23 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-170-4pjSiF8BOyCJn49I9cCArQ-1; Thu, 16 Jul 2020 06:14:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08640100AA2D; Thu, 16 Jul 2020 10:14:37 +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 DDC1B5C1C3; Thu, 16 Jul 2020 10:14:36 +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 AE2C8180530D; Thu, 16 Jul 2020 10:14:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA7BKa020398 for ; Thu, 16 Jul 2020 06:07:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id C5EF72DE69; Thu, 16 Jul 2020 10:07:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40ECD2DE72 for ; Thu, 16 Jul 2020 10:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894702; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=MON3v3If4rzp7NkL9iguujHmfw1vMmtzTuQrvRZwyHI=; b=YLP3cXVvrvQBaSwtJcGVvDZEy6qwnPlj9jDYZ4gZ4ktuKtpqdjoYEI3xEXsrf3h4pnHZcz wz3dEIhRXtHdFmXfnIBUxzSUUCuDcVf1bGYRgDVMiPLPduntYWvm+15qSa29TTDGfmCjf/ xGaywGmgdpAJ8/lI42W5jywj5LcLR5g= X-MC-Unique: 4pjSiF8BOyCJn49I9cCArQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 310/351] meson: tests: build helper binaries Date: Thu, 16 Jul 2020 11:59:06 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- tests/Makefile.am | 39 --------------------------------------- tests/meson.build | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 39 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 498655d4776..939d97a9985 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,14 +16,6 @@ ## License along with this library. If not, see ## . =20 -if WITH_QEMU -test_helpers +=3D qemucapsprobe -endif WITH_QEMU - -if WITH_NSS -test_helpers +=3D nsslinktest nssguestlinktest -endif WITH_NSS - test_scripts =3D libvirtd_test_scripts =3D \ libvirtd-fail \ @@ -67,11 +59,6 @@ file-access-clean: > test_file_access.txt endif WITH_LINUX =20 -if WITH_TESTS -noinst_PROGRAMS =3D $(test_helpers) -else ! WITH_TESTS -check_PROGRAMS =3D $(test_helpers) -endif ! WITH_TESTS =20 TESTS =3D $(test_scripts) =20 @@ -80,29 +67,3 @@ VALGRIND =3D valgrind --quiet --leak-check=3Dfull --trac= e-children=3Dyes \ --suppressions=3D$(abs_srcdir)/.valgrind.supp valgrind: $(MAKE) check VG=3D"$(LIBTOOL) --mode=3Dexecute $(VALGRIND)" - -if WITH_QEMU -qemucapsprobe_SOURCES =3D \ - qemucapsprobe.c -qemucapsprobe_LDADD =3D \ - libqemutestdriver.la $(LDADDS) -endif ! WITH_QEMU - -if WITH_NSS -## Intentionaly not linking with anything else. -## See the test source for more detailed explanation. -nsslinktest_SOURCES =3D nsslinktest.c -nsslinktest_CFLAGS =3D \ - $(AM_CFLAGS) \ - -I$(top_srcdir)/tools/nss -nsslinktest_LDADD =3D ../tools/nss/libnss_libvirt_impl.la -nsslinktest_LDFLAGS =3D $(NULL) - -nssguestlinktest_SOURCES =3D nsslinktest.c -nssguestlinktest_CFLAGS =3D \ - -DLIBVIRT_NSS_GUEST \ - $(AM_CFLAGS) \ - -I$(top_srcdir)/tools/nss -nssguestlinktest_LDADD =3D ../tools/nss/libnss_libvirt_guest_impl.la -nssguestlinktest_LDFLAGS =3D $(NULL) -endif ! WITH_NSS diff --git a/tests/meson.build b/tests/meson.build index ebf53891ec7..5df9973ccf9 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -578,6 +578,34 @@ endforeach =20 helpers =3D [] =20 +if conf.has('WITH_NSS') + helpers +=3D [ + # Intentionaly not linking with anything else. + # See the test source for more detailed explanation. + { + 'name': 'nsslinktest', + 'include': [ nss_inc_dir ], + 'link_with': [ nss_libvirt_impl ], + }, + { + 'name': 'nssguestlinktest', + 'sources': [ 'nsslinktest.c' ], + 'c_args': [ '-DLIBVIRT_NSS_GUEST' ], + 'include': [ nss_inc_dir ], + 'link_with': [ nss_libvirt_guest_impl ], + }, + ] +endif + +if conf.has('WITH_QEMU') + helpers +=3D [ + { + 'name': 'qemucapsprobe', + 'link_with': [ test_qemu_driver_lib, libvirt_lib ], + }, + ] +endif + foreach data : helpers helper_sources =3D '@0@.c'.format(data['name']) helper_bin =3D executable( --=20 2.26.2