From nobody Mon Sep 16 19:29:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1693923953; cv=none; d=zohomail.com; s=zohoarc; b=Wu4gUxXCo9XlddTxKSTQn9rtVT+vp15RP8NgdjLHJWzOWqTSvjFSVAUFnfB3NsjHYYZi5Vvd/WJJmtG4bmMA04jxtDILVjg7sw3hHr1/2Ar8GsUSjS3+yQjkwz/2SG0PDjn3o9bNS3T/76qe7RxXJTdj/WQoiFjEi5pzjcHoTHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923953; 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=9a+xY6/a/xBOet9Du5VmFdrTCcJQYgsN783mwFj1XGM=; b=RTv4rXqCXzRQz14XCuu6ILV65ldjgnrTgUZLtWiaau8WtRi7HES9PoGNIf5tJs3tPeiFKnl9BX60geutxGm9ME5bxs9y4BO1KTji7tWhwnTmCcboutp1yo+KReI2i8M3Q93NchHicdyH63y7/zT6OTZBHkFMuCmEPvMs4RnYk9c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1693923953354330.75732867784257; Tue, 5 Sep 2023 07:25:53 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-411-T7REgFV7Oe28yZKfzz6Ptg-1; Tue, 05 Sep 2023 10:25:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9ABFF946305; Tue, 5 Sep 2023 14:24:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85EAD2026D68; Tue, 5 Sep 2023 14:24:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6B02E1946595; Tue, 5 Sep 2023 14:24:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8523B19465B7 for ; Tue, 5 Sep 2023 14:24:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 67BBF1121314; Tue, 5 Sep 2023 14:24:36 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE1891121319 for ; Tue, 5 Sep 2023 14:24:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923949; 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=9a+xY6/a/xBOet9Du5VmFdrTCcJQYgsN783mwFj1XGM=; b=Ku25jiSqIfiGUUHublT5TjUwR5+Z17X6T3O5vYqVtp6KySwY4Kaggyy+wJC4iP/r1/Bjgw QOZujxEhLd5IjlHLKYpID3zZPfFlcRiuZ2p0OPGBzCtLOjy40PTpHyj4GZnNDqnunK/5Zd 7MpLhiA5/z+lwxK162sjczOtADDFrzk= X-MC-Unique: T7REgFV7Oe28yZKfzz6Ptg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/51] qemuxml2argvtest: Simplify invocation of GIC tests Date: Tue, 5 Sep 2023 16:23:40 +0200 Message-ID: <0701a6e1f3e40ed84b62076f972142b785edec37.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693923956933100005 Content-Type: text/plain; charset="utf-8" Change DO_TEST_GIC so that it accepts the version and switch it to use DO_TEST_CAPS_ARCH_VER_FULL internally which will ensure that the output filenames conform to the format we use for real capabilities. This also allows us to convert a few of versioned tests to use this improved macro. Signed-off-by: Peter Krempa --- ...ch64-gic-default-both.aarch64-latest.args} | 0 ...arch64-gic-default-v2.aarch64-latest.args} | 0 ...arch64-gic-default-v3.aarch64-latest.args} | 0 ...s =3D> aarch64-gic-host.aarch64-latest.args} | 0 ...aarch64-gic-none-both.aarch64-latest.args} | 0 ... aarch64-gic-none-tcg.aarch64-latest.args} | 0 ...> aarch64-gic-none-v2.aarch64-latest.args} | 0 ...> aarch64-gic-none-v3.aarch64-latest.args} | 0 ...rgs =3D> aarch64-gic-v2.aarch64-latest.args} | 0 ...rgs =3D> aarch64-gic-v3.aarch64-latest.args} | 0 tests/qemuxml2argvtest.c | 79 +++++++------------ 11 files changed, 28 insertions(+), 51 deletions(-) rename tests/qemuxml2argvdata/{aarch64-gic-default-both.args =3D> aarch64-= gic-default-both.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-v2.args =3D> aarch64-gi= c-default-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-v3.args =3D> aarch64-gi= c-default-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-host.args =3D> aarch64-gic-host= .aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-both.args =3D> aarch64-gic= -none-both.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-tcg.args =3D> aarch64-gic-= none-tcg.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-v2.args =3D> aarch64-gic-n= one-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-v3.args =3D> aarch64-gic-n= one-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-v2.args =3D> aarch64-gic-v2.aar= ch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-v3.args =3D> aarch64-gic-v3.aar= ch64-latest.args} (100%) diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/q= emuxml2argvdata/aarch64-gic-default-both.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-both.args rename to tests/qemuxml2argvdata/aarch64-gic-default-both.aarch64-latest.ar= gs diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-v2.args rename to tests/qemuxml2argvdata/aarch64-gic-default-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-v3.args rename to tests/qemuxml2argvdata/aarch64-gic-default-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2a= rgvdata/aarch64-gic-host.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-host.args rename to tests/qemuxml2argvdata/aarch64-gic-host.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemu= xml2argvdata/aarch64-gic-none-both.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-both.args rename to tests/qemuxml2argvdata/aarch64-gic-none-both.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemux= ml2argvdata/aarch64-gic-none-tcg.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-tcg.args rename to tests/qemuxml2argvdata/aarch64-gic-none-tcg.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-v2.args rename to tests/qemuxml2argvdata/aarch64-gic-none-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-v3.args rename to tests/qemuxml2argvdata/aarch64-gic-none-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2arg= vdata/aarch64-gic-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-v2.args rename to tests/qemuxml2argvdata/aarch64-gic-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2arg= vdata/aarch64-gic-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-v3.args rename to tests/qemuxml2argvdata/aarch64-gic-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fd8339a819..92ff7e4b1c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -877,13 +877,8 @@ mymain(void) # define DO_TEST_NOCAPS(name) \ DO_TEST_FULL(name, "", ARG_END) -/* GIC tests use 'latest' capabilities */ -# define DO_TEST_GIC(name, gic) \ - DO_TEST_FULL(name, "", \ - ARG_GIC, gic, \ - ARG_CAPS_ARCH, "aarch64", \ - ARG_CAPS_VER, "latest", \ - ARG_END) +# define DO_TEST_GIC(name, ver, gic) \ + DO_TEST_CAPS_ARCH_VER_FULL(name, "aarch64", ver, ARG_GIC, gic, ARG_END) # define DO_TEST_FAILURE(name, ...) \ DO_TEST_FULL(name, "", \ @@ -2249,50 +2244,32 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-default-nic", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-cpu-passthrough", "aarch64"); - DO_TEST_FULL("aarch64-gic-none", ".aarch64-4.2.0", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "4.2.0", - ARG_END); - DO_TEST_FULL("aarch64-gic-none", ".aarch64-latest", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_END); - DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2); - DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3); - DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH); - DO_TEST_FULL("aarch64-gic-none-tcg", "", - ARG_GIC, GIC_BOTH, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS_LAST, - ARG_END); - DO_TEST_FULL("aarch64-gic-default", ".aarch64-4.2.0", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "4.2.0", - ARG_END); - DO_TEST_FULL("aarch64-gic-default", ".aarch64-latest", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_END); - DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2); - DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3); - DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH); - DO_TEST_GIC("aarch64-gic-v2", GIC_NONE); - DO_TEST_GIC("aarch64-gic-v2", GIC_V2); - DO_TEST_GIC("aarch64-gic-v2", GIC_V3); - DO_TEST_GIC("aarch64-gic-v2", GIC_BOTH); - DO_TEST_GIC("aarch64-gic-v3", GIC_NONE); - DO_TEST_GIC("aarch64-gic-v3", GIC_V2); - DO_TEST_GIC("aarch64-gic-v3", GIC_V3); - DO_TEST_GIC("aarch64-gic-v3", GIC_BOTH); - DO_TEST_GIC("aarch64-gic-host", GIC_NONE); - DO_TEST_GIC("aarch64-gic-host", GIC_V2); - DO_TEST_GIC("aarch64-gic-host", GIC_V3); - DO_TEST_GIC("aarch64-gic-host", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-none", "4.2.0", GIC_NONE); + DO_TEST_GIC("aarch64-gic-none", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-none-v2", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-none-v3", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-none-both", "latest", GIC_BOTH); + DO_TEST_CAPS_ARCH_VER_FULL("aarch64-gic-none-tcg", "aarch64", "latest", + ARG_GIC, GIC_BOTH, + ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS= _LAST, + ARG_END); + DO_TEST_GIC("aarch64-gic-default", "4.2.0", GIC_NONE); + DO_TEST_GIC("aarch64-gic-default", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-default-v2", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-default-v3", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-default-both", "latest", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_BOTH); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-invalid", "aarch64"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-virt", "aarch64"= ); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-arm", "ppc64"); --=20 2.41.0