From nobody Mon Feb 9 14:03:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619790805; cv=none; d=zohomail.com; s=zohoarc; b=NZczxHsklkFIi7aBkRE2pBVrWW339ncoHU5J4PlVTB7G+0dNxOAQzvHf0wsTTDzSENVbSau+CmSmNGhWFYSqpa2tw1owhmHNwyNsssj25Uz6qcCBZopl8Vc4zcV4Hu7VxsBIt0IH2kqP2mpmY+PiLMoHW+el0MNgtz1OmzUjGzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619790805; h=Content-Type:Content-Transfer-Encoding:Cc: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=O4BOOaXPe8Kuzccz1aS2grvfaVdsqyBeB/wA3uOnaqk=; b=Rg6QnVYdkh/dB7RqHQoM06/4xKP3u0K0wB+xgmRAhjCo+zYrdvBsOphIEydm1RuuOMh9kpRKQ0f+R65IuuX4ofKgUbaYhPfu5+5zdcdVaS5TpP3pkdxBWvuphtPobVmNN5MosOEwHLaY4ESY2Nhak9BAFe6fmfaRLF0ieP2YFf4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1619790805605859.0120631126064; Fri, 30 Apr 2021 06:53:25 -0700 (PDT) Received: from localhost ([::1]:46618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcTa8-00019y-HJ for importer@patchew.org; Fri, 30 Apr 2021 09:53:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTJ1-0005e9-Al for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTIv-0008Ds-1J for qemu-devel@nongnu.org; Fri, 30 Apr 2021 09:35:43 -0400 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-584-NAaXOMMJP9iFnvfDx_GIWg-1; Fri, 30 Apr 2021 09:35:32 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22BB9801B28; Fri, 30 Apr 2021 13:35:31 +0000 (UTC) Received: from wainer-laptop.localdomain.com (ovpn-116-202.gru2.redhat.com [10.97.116.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id C96415D9E2; Fri, 30 Apr 2021 13:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619789736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O4BOOaXPe8Kuzccz1aS2grvfaVdsqyBeB/wA3uOnaqk=; b=aMnIInUhK/nCFzf5VuD+i2g0CePEJnx9nK42htw8bz2Ll9I6duCecI0fdBUQsBFSgn7yNG 4ff3s6YpCDj5YNbluNNlDVMtDHEo9/ww2V1/oZ7GSaJuq7rwSI0TvUgRGY0KEjxCPvcoWX LmVGl4OcjoIXCNMq6X1idpRl5uUZlrU= X-MC-Unique: NAaXOMMJP9iFnvfDx_GIWg-1 From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 7/7] tests/acceptance: Handle cpu tag on x86_cpu_model_versions tests Date: Fri, 30 Apr 2021 10:34:14 -0300 Message-Id: <20210430133414.39905-8-wainersm@redhat.com> In-Reply-To: <20210430133414.39905-1-wainersm@redhat.com> References: <20210430133414.39905-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wrampazz@redhat.com, philmd@redhat.com, pavel.dovgaluk@ispras.ru, crosa@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Some test cases on x86_cpu_model_versions.py are corner cases because they need to pass extra options to the -cpu argument. Once the avocado_qemu framework will set -cpu automatically, the value should be reset. This chan= ged those tests so to call set_vm_arg() to overwrite the -cpu value. Signed-off-by: Wainer dos Santos Moschetta --- tests/acceptance/x86_cpu_model_versions.py | 40 +++++++++++++++++----- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/tests/acceptance/x86_cpu_model_versions.py b/tests/acceptance/= x86_cpu_model_versions.py index 77ed8597a4..0e9feda62d 100644 --- a/tests/acceptance/x86_cpu_model_versions.py +++ b/tests/acceptance/x86_cpu_model_versions.py @@ -252,10 +252,13 @@ def get_cpu_prop(self, prop): def test_4_1(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.1 + :avocado: tags=3Dcpu:Cascadelake-Server """ # machine-type only: self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=3Don= ,check=3Doff,enforce=3Doff') + self.set_vm_arg('-cpu', + 'Cascadelake-Server,x-force-features=3Don,check=3D= off,' + 'enforce=3Doff') self.vm.launch() self.assertFalse(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.1 + Cascadelake-Server should not ha= ve arch-capabilities') @@ -263,9 +266,12 @@ def test_4_1(self): def test_4_0(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.0 + :avocado: tags=3Dcpu:Cascadelake-Server """ self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=3Don= ,check=3Doff,enforce=3Doff') + self.set_vm_arg('-cpu', + 'Cascadelake-Server,x-force-features=3Don,check=3D= off,' + 'enforce=3Doff') self.vm.launch() self.assertFalse(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.0 + Cascadelake-Server should not ha= ve arch-capabilities') @@ -273,10 +279,13 @@ def test_4_0(self): def test_set_4_0(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.0 + :avocado: tags=3Dcpu:Cascadelake-Server """ # command line must override machine-type if CPU model is not vers= ioned: self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=3Don= ,check=3Doff,enforce=3Doff,+arch-capabilities') + self.set_vm_arg('-cpu', + 'Cascadelake-Server,x-force-features=3Don,check=3D= off,' + 'enforce=3Doff,+arch-capabilities') self.vm.launch() self.assertTrue(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.0 + Cascadelake-Server,+arch-capabili= ties should have arch-capabilities') @@ -284,9 +293,12 @@ def test_set_4_0(self): def test_unset_4_1(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.1 + :avocado: tags=3Dcpu:Cascadelake-Server """ self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=3Don= ,check=3Doff,enforce=3Doff,-arch-capabilities') + self.set_vm_arg('-cpu', + 'Cascadelake-Server,x-force-features=3Don,check=3D= off,' + 'enforce=3Doff,-arch-capabilities') self.vm.launch() self.assertFalse(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.1 + Cascadelake-Server,-arch-capabil= ities should not have arch-capabilities') @@ -294,10 +306,13 @@ def test_unset_4_1(self): def test_v1_4_0(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.0 + :avocado: tags=3Dcpu:Cascadelake-Server """ # versioned CPU model overrides machine-type: self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server-v1,x-force-features= =3Don,check=3Doff,enforce=3Doff') + self.set_vm_arg('-cpu', + 'Cascadelake-Server-v1,x-force-features=3Don,check= =3Doff,' + 'enforce=3Doff') self.vm.launch() self.assertFalse(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.0 + Cascadelake-Server-v1 should not= have arch-capabilities') @@ -305,9 +320,12 @@ def test_v1_4_0(self): def test_v2_4_0(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.0 + :avocado: tags=3Dcpu:Cascadelake-Server """ self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server-v2,x-force-features= =3Don,check=3Doff,enforce=3Doff') + self.set_vm_arg('-cpu', + 'Cascadelake-Server-v2,x-force-features=3Don,check= =3Doff,' + 'enforce=3Doff') self.vm.launch() self.assertTrue(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.0 + Cascadelake-Server-v2 should have= arch-capabilities') @@ -315,10 +333,13 @@ def test_v2_4_0(self): def test_v1_set_4_0(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.0 + :avocado: tags=3Dcpu:Cascadelake-Server """ # command line must override machine-type and versioned CPU model: self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server-v1,x-force-features= =3Don,check=3Doff,enforce=3Doff,+arch-capabilities') + self.set_vm_arg('-cpu', + 'Cascadelake-Server-v1,x-force-features=3Don,check= =3Doff,' + 'enforce=3Doff,+arch-capabilities') self.vm.launch() self.assertTrue(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.0 + Cascadelake-Server-v1,+arch-capab= ilities should have arch-capabilities') @@ -326,9 +347,12 @@ def test_v1_set_4_0(self): def test_v2_unset_4_1(self): """ :avocado: tags=3Dmachine:pc-i440fx-4.1 + :avocado: tags=3Dcpu:Cascadelake-Server """ self.vm.add_args('-S') - self.vm.add_args('-cpu', 'Cascadelake-Server-v2,x-force-features= =3Don,check=3Doff,enforce=3Doff,-arch-capabilities') + self.set_vm_arg('-cpu', + 'Cascadelake-Server-v2,x-force-features=3Don,check= =3Doff,' + 'enforce=3Doff,-arch-capabilities') self.vm.launch() self.assertFalse(self.get_cpu_prop('arch-capabilities'), 'pc-i440fx-4.1 + Cascadelake-Server-v2,-arch-capa= bilities should not have arch-capabilities') --=20 2.29.2