From nobody Fri Oct 18 06:20:15 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=1693923957; cv=none; d=zohomail.com; s=zohoarc; b=cm6/fqY1jRa7FpPQJC+Z8wv5QGSbWRP80TmDh6XyP6fOzsRtpvuIHZlYEwtqRaqIoRzaCbla915bo4YG5+KShveJ1h7ns1ONj6CdvrkqHLIvPUySS3NYV9+USiNspo1MKRlPyc7/sqnfozEAhnoL/FgKqQz6bh3PbVEZaGcOLOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923957; 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=5HOrWy23IIzRH+nGR1+t6gN1BMGmsJPvVhTRNq/IMyY=; b=eIXP42c+7rDSAHO9M1g8D1Ek5TF+utezigYFd8fCh/IzHcdYFRMt9kp1EYbcNxoPrENPUpa5xMAWn1ASkZe+Akb9ZFlPWxO9vfrHKJBkRUzmEEAfXuT/10aiYHMULGWVOQ0X8PLopjp8PLfBOYVneTlyMnzGH25jKGNZvzPIvmg= 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 1693923957666132.74648588687148; Tue, 5 Sep 2023 07:25:57 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-509-RzDi37cHP6OvZyCPfZVgNA-1; Tue, 05 Sep 2023 10:25:46 -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 ACD573844E0C; Tue, 5 Sep 2023 14:24:48 +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 966022026D4B; Tue, 5 Sep 2023 14:24:48 +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 87E8C1946597; Tue, 5 Sep 2023 14:24:48 +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 5E04019465A2 for ; Tue, 5 Sep 2023 14:24:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 517781121318; Tue, 5 Sep 2023 14:24:47 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFE191121314 for ; Tue, 5 Sep 2023 14:24:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923956; 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=5HOrWy23IIzRH+nGR1+t6gN1BMGmsJPvVhTRNq/IMyY=; b=aVFUbEXCzFhWtaR2xkBLjmoauS32gWzY3YzsBU83uJHj6Auuz2Sy/JSkyDbabFF5akPQmT dVMSY0iGPZ+LxfO9FwYn/PZUspjEPPqrDO3Jg5tOf4C9xb9y9NY596b4SlrEweQnc91ijj 46bjTl054fyIDEtkxoB70mREACeXhBk= X-MC-Unique: RzDi37cHP6OvZyCPfZVgNA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 22/51] qemuxml2argvtest: Modernize negative testing for hugepages Date: Tue, 5 Sep 2023 16:23:49 +0200 Message-ID: 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: 1693923958378100013 Content-Type: text/plain; charset="utf-8" Use proper version for negative case of 'hugepages-memaccess3' QEMU allowed to configure a memory backend for default ram since qemu-5.2. Fix the test to use real capability data. Signed-off-by: Peter Krempa --- ...rr =3D> hugepages-default-1G-nodeset-2M.x86_64-latest.err} | 0 ...id.err =3D> hugepages-memaccess-invalid.x86_64-latest.err} | 0 ...memaccess3.err =3D> hugepages-memaccess3.x86_64-5.1.0.err} | 0 tests/qemuxml2argvtest.c | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename tests/qemuxml2argvdata/{hugepages-default-1G-nodeset-2M.err =3D> hu= gepages-default-1G-nodeset-2M.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-memaccess-invalid.err =3D> hugepa= ges-memaccess-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-memaccess3.err =3D> hugepages-mem= access3.x86_64-5.1.0.err} (100%) diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.err b/t= ests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.err rename to tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.x86_64-lat= est.err diff --git a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.err b/tests= /qemuxml2argvdata/hugepages-memaccess-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess-invalid.err rename to tests/qemuxml2argvdata/hugepages-memaccess-invalid.x86_64-latest.= err diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.err b/tests/qemuxm= l2argvdata/hugepages-memaccess3.x86_64-5.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess3.err rename to tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-5.1.0.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0a217949b8..a6d569e0c6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1137,7 +1137,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hugepages-default-2M"); DO_TEST_CAPS_LATEST("hugepages-default-system-size"); DO_TEST_CAPS_LATEST_FAILURE("hugepages-default-5M"); - DO_TEST_PARSE_ERROR_NOCAPS("hugepages-default-1G-nodeset-2M"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-default-1G-nodeset-2M"); DO_TEST_CAPS_LATEST("hugepages-nodeset"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-nodeset-nonexist"); DO_TEST_CAPS_LATEST("hugepages-numa-default"); @@ -1147,10 +1147,10 @@ mymain(void) DO_TEST_CAPS_LATEST("hugepages-numa-nodeset-part"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-numa-nodeset-nonexist"); DO_TEST_CAPS_LATEST("hugepages-shared"); - DO_TEST_PARSE_ERROR_NOCAPS("hugepages-memaccess-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-memaccess-invalid"); DO_TEST_CAPS_LATEST("hugepages-memaccess"); DO_TEST_CAPS_LATEST("hugepages-memaccess2"); - DO_TEST_PARSE_ERROR_NOCAPS("hugepages-memaccess3"); + DO_TEST_CAPS_VER_PARSE_ERROR("hugepages-memaccess3", "5.1.0"); DO_TEST_CAPS_LATEST("hugepages-memaccess3"); DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST_NOCAPS("nosharepages"); --=20 2.41.0