From nobody Sun Feb 8 12:58:04 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=1594894626; cv=none; d=zohomail.com; s=zohoarc; b=e4MMjA+Lz1HdmjEVEbpfQFF93XVH+685pA8c67MJBQiPt2lmftnAOiEYo2RZ7bLpLYnweqTfKM0hHvVNM8+BR3RPDTgYSaovANWsY1e35o5AGk/yW1wILdr9m/Vkz/1UKez9ksnWnnUnJBdQKbIwAnN9vvRnBWCzHRUXmzrgBPc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894626; 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=t5kgJmveHPLYquACkL3AaPBSWxxVhIs8mPaeW48+rns=; b=Z/L6nZWgNCFz8Nc4tf8ILnbJ7eIKdnDstWmEkgbbhRXap9E2E/CYYSVvPozPMDnvC4AmbbqLSM47n/MSmhH3GFqUw0yyoZXbgj59pExUrNRV/L+M5G4Lt6cGmN3Lpd0pKkQctSqmhyqbtlVPR0gW1+JERMkVAlHZ6kCMgv5WFn8= 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-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894626315624.6999755322106; Thu, 16 Jul 2020 03:17:06 -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-29-TgPkpA-INsm4BZZIaPjFBw-1; Thu, 16 Jul 2020 06:14:40 -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 ABB0C1009600; Thu, 16 Jul 2020 10:14:34 +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 8D6F05C1C3; Thu, 16 Jul 2020 10:14:34 +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 5B866181D0B8; Thu, 16 Jul 2020 10:14:34 +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 06GA7AkP020343 for ; Thu, 16 Jul 2020 06:07:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 018962DE69; Thu, 16 Jul 2020 10:07:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 707E02DE72 for ; Thu, 16 Jul 2020 10:07:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894624; 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=t5kgJmveHPLYquACkL3AaPBSWxxVhIs8mPaeW48+rns=; b=eGUuczguoGWQ+EJ1+IPj+BnIUnDz1fqBjYpOAzU4VYn1JcGjnncSO8PfrfyFo0PaenfDOR 0NBfT5L0iNokoZiYrXy6ra2Apl/2Odrqirw6zkEOFYuFIvoB76Qe2kSzLmN/7KNBWrcF4t m1vrmFR1dN+DlsuMh06meB7I13WuGxQ= X-MC-Unique: TgPkpA-INsm4BZZIaPjFBw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 308/351] meson: tests: add yajl specific tests Date: Thu, 16 Jul 2020 11:59:04 +0200 Message-Id: <827e6f438d8ea4196ec0802e490cb79f6e99ae89.1594891445.git.phrdina@redhat.com> 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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 | 29 +++-------------------------- tests/meson.build | 8 ++++++++ 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index f30fc379077..498655d4776 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,10 +20,6 @@ if WITH_QEMU test_helpers +=3D qemucapsprobe endif WITH_QEMU =20 -if WITH_YAJL -test_programs +=3D virjsontest -endif WITH_YAJL - if WITH_NSS test_helpers +=3D nsslinktest nssguestlinktest endif WITH_NSS @@ -72,13 +68,12 @@ file-access-clean: endif WITH_LINUX =20 if WITH_TESTS -noinst_PROGRAMS =3D $(test_programs) $(test_helpers) +noinst_PROGRAMS =3D $(test_helpers) else ! WITH_TESTS -check_PROGRAMS =3D $(test_programs) $(test_helpers) +check_PROGRAMS =3D $(test_helpers) endif ! WITH_TESTS =20 -TESTS =3D $(test_programs) \ - $(test_scripts) +TESTS =3D $(test_scripts) =20 VALGRIND =3D valgrind --quiet --leak-check=3Dfull --trace-children=3Dyes \ --trace-children-skip=3D"*/tools/virsh","*/tests/commandhelper","/usr/bin= /*" \ @@ -111,21 +106,3 @@ nssguestlinktest_CFLAGS =3D \ nssguestlinktest_LDADD =3D ../tools/nss/libnss_libvirt_guest_impl.la nssguestlinktest_LDFLAGS =3D $(NULL) endif ! WITH_NSS - -if WITH_YAJL -virmacmaptest_SOURCES =3D \ - virmacmaptest.c testutils.h testutils.c -virmacmaptest_LDADD =3D $(LDADDS) - -virnetdevopenvswitchtest_SOURCES =3D \ - virnetdevopenvswitchtest.c testutils.h testutils.c -virnetdevopenvswitchtest_LDADD =3D $(LDADDS) - -test_programs +=3D \ - virmacmaptest \ - virnetdevopenvswitchtest -endif ! WITH_YAJL - -virjsontest_SOURCES =3D \ - virjsontest.c testutils.h testutils.c -virjsontest_LDADD =3D $(LDADDS) diff --git a/tests/meson.build b/tests/meson.build index 65a1f2b31c4..40acbcee6cd 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -528,6 +528,14 @@ if conf.has('WITH_VMX') ] endif =20 +if conf.has('WITH_YAJL') + tests +=3D [ + { 'name': 'virjsontest' }, + { 'name': 'virmacmaptest' }, + { 'name': 'virnetdevopenvswitchtest' }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2