From nobody Fri May 17 11:59:01 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704372508782962.6146492038774; Thu, 4 Jan 2024 04:48:28 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 65ED817B8; Thu, 4 Jan 2024 07:48:27 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 101761749; Thu, 4 Jan 2024 07:47:24 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 263EB1729; Thu, 4 Jan 2024 07:47:21 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id BAD84170D for ; Thu, 4 Jan 2024 07:47:17 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-488-IwYvNDf1OjygaV5i7PROeA-1; Thu, 04 Jan 2024 07:47:11 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 69F691019C93 for ; Thu, 4 Jan 2024 12:47:11 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DA9B492BE6; Thu, 4 Jan 2024 12:47:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: IwYvNDf1OjygaV5i7PROeA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 18.5/19] qemuxml2argvtest: Mark 'nbdkit' tests as skipped if nbdkit is not compiled in Date: Thu, 4 Jan 2024 13:47:01 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: RIREB6AUF55P2NL3OFCWWJIZJJDGL2ZJ X-Message-ID-Hash: RIREB6AUF55P2NL3OFCWWJIZJJDGL2ZJ X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: mprivozn@redhat.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1704372511189100001 Rather than completely compiling out the tests mark them as skipped. This will allow us to add a checker that all input files are accounted for. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- Sending addendum to the series to avoid resending the whole series. tests/qemuxml2argvtest.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 48ee433495..7d40b06171 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -627,6 +627,15 @@ testCompareXMLToArgv(const void *data) if (testInfoCheckDuplicate(info) < 0) goto cleanup; +# if !WITH_NBDKIT + /* when compiled without nbdkit support we want to skip the test after + * marking it as used */ + if (info->args.fakeNbdkitCaps) { + ret =3D EXIT_AM_SKIP; + goto cleanup; + } +# endif /* !WITH_NBDKIT */ + if (info->arch !=3D VIR_ARCH_NONE && info->arch !=3D VIR_ARCH_X86_64) qemuTestSetHostArch(&driver, info->arch); @@ -906,12 +915,8 @@ mymain(void) # define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \ DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ARG_END) -# if WITH_NBDKIT -# define DO_TEST_CAPS_LATEST_NBDKIT(name, ...) \ +# define DO_TEST_CAPS_LATEST_NBDKIT(name, ...) \ DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", ARG_NBDKIT_CAPS, __VA_AR= GS__, QEMU_NBDKIT_CAPS_LAST, ARG_END) -# else -# define DO_TEST_CAPS_LATEST_NBDKIT(name, ...) -# endif /* WITH_NBDKIT */ # define DO_TEST_CAPS_LATEST(name) \ DO_TEST_CAPS_ARCH_LATEST(name, "x86_64") --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org