From patchwork Wed Jul 3 14:06:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 809348 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp708060wru; Wed, 3 Jul 2024 07:07:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV9GhPEKHoymorqgsdhFwloYMkOARM94fi+qhw28VOnbSd69pHGDmI9iEb7coGA2UO9+xsp8l7i1b4Geqxf6uu7 X-Google-Smtp-Source: AGHT+IFFJTcRSu+3NYNC1z9BqwaM8FP8gnKRmY2AUbRIetG8JKjgiicArQUn0+M4bDnxN+ghVcEi X-Received: by 2002:a05:6870:1587:b0:24c:b4da:725d with SMTP id 586e51a60fabf-25db344403dmr11197841fac.33.1720015672199; Wed, 03 Jul 2024 07:07:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720015672; cv=none; d=google.com; s=arc-20160816; b=Hx4u6pBXlkcw2PSip2eoxz7OE8LhjgcIFYlti0LAg6YUJ7SME/M764uJFtrmuOqxnR 7UWnIodld6aGwewRLmtkESB+xUkvK8Y+/jxUXtIqd57oru4kyND2A3DytjpEonYj+Aqb FkvQajt3z2mFda07EHA8VPPttPCsI2qN2gLPW4RlpaCxFq1HpOAoaprbiTk+j1NWOM1J SelnyUEkOVPYf5TQ4o8yskKi+d2HoxRo6xEEA/fJXzD2d5a12t3G3N1BhwRNxzZYyp2m VTDO76ML7xg1u57zOjqEIdC1lpCThzR2WGRtjOFvP+ZaVOISUGh5+yDK16puuAZRMG+H 8uAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:in-reply-to:references :message-id:content-transfer-encoding:mime-version:subject:date:from; bh=d9lmNbx2IXLwtRlzxN/3vizsqgCNWrrZTSu0AL+B/NU=; fh=2XNni5tFqqNsYuVOJGxzVTMSzHzZnaSMOOPrr5cXMU4=; b=pBcq58xtqyu5JPz8zkzKwrCbV911lmEWqxSI6uJCUOwe+EqGIb67HqEYNq+0eEUXXJ B1u1Qm6mu7jpfY8nzq8h00ilcEeeGQw2YIvaNjbfNsoGFtoUfmBCsdSszSWj3RReWIcZ 7uXDQWSY45yt6V1BgNdsqdgy0BoIJnr81GQYVq9OBy+wKKumfXlMls6Z3NxOHAkPYS3y ha3GJqMhev9m7nR/UlusA8z0H4kMUo40acv+C/zJ9iJ4qTCUXHiTNMXuZVt9ZzIOqX62 v/JbkI/pgyX4XuFiNljFLY3GCPyARdzJs6040uRJtSOZ3YGNA2YZvpnHvrV/3KCAf/fS Dqpg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-48f9b23baf1si1782269137.263.2024.07.03.07.07.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Jul 2024 07:07:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP0de-0001qg-Jc; Wed, 03 Jul 2024 10:07:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP0dL-0001mT-TY; Wed, 03 Jul 2024 10:06:57 -0400 Received: from muminek.juszkiewicz.com.pl ([213.251.184.221]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP0d1-0008R5-1s; Wed, 03 Jul 2024 10:06:53 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 367D2260757; Wed, 3 Jul 2024 16:06:31 +0200 (CEST) X-Virus-Scanned: Debian amavis at juszkiewicz.com.pl Received: from muminek.juszkiewicz.com.pl ([127.0.0.1]) by localhost (muminek.juszkiewicz.com.pl [127.0.0.1]) (amavis, port 10024) with ESMTP id v8R6mgUZh_py; Wed, 3 Jul 2024 16:06:29 +0200 (CEST) Received: from applejack.lan (83.8.74.165.ipv4.supernova.orange.pl [83.8.74.165]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTPSA id 6FD07260841; Wed, 3 Jul 2024 16:06:27 +0200 (CEST) From: Marcin Juszkiewicz Date: Wed, 03 Jul 2024 16:06:12 +0200 Subject: [PATCH v4 2/2] tests/avocado: add test for default sbsa-ref cpu MIME-Version: 1.0 Message-Id: <20240703-b4-move-to-freebsd-v4-2-07191f958530@linaro.org> References: <20240703-b4-move-to-freebsd-v4-0-07191f958530@linaro.org> In-Reply-To: <20240703-b4-move-to-freebsd-v4-0-07191f958530@linaro.org> To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Leif Lindholm , Radoslaw Biernacki , Peter Maydell , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , Marcin Juszkiewicz X-Mailer: b4 0.13.0 Received-SPF: softfail client-ip=213.251.184.221; envelope-from=marcin.juszkiewicz@linaro.org; helo=muminek.juszkiewicz.com.pl X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We changed sbsa-ref cpu several times already and may do it again in a future. To newer core or to enable/disable some properties. This change switches Neoverse-N2 tests to 'let test default cpu' ones. Signed-off-by: Marcin Juszkiewicz --- tests/avocado/machine_aarch64_sbsaref.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index 2e27d37cb8..46a1d982f3 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -113,7 +113,7 @@ def test_sbsaref_edk2_firmware(self): # This tests the whole boot chain from EFI to Userspace # We only boot a whole OS for the current top level CPU and GIC # Other test profiles should use more minimal boots - def boot_alpine_linux(self, cpu): + def boot_alpine_linux(self, cpu=False): self.fetch_firmware() iso_url = ( @@ -126,12 +126,14 @@ def boot_alpine_linux(self, cpu): self.vm.set_console() self.vm.add_args( - "-cpu", - cpu, "-drive", f"file={iso_path},format=raw", ) + # let allow test which will use default cpu of platform + if cpu: + self.vm.add_args("-cpu", cpu) + self.vm.launch() wait_for_console_pattern(self, "Welcome to Alpine Linux 3.17") @@ -142,12 +144,12 @@ def test_sbsaref_alpine_linux_cortex_a57(self): """ self.boot_alpine_linux("cortex-a57") - def test_sbsaref_alpine_linux_neoverse_n1(self): + # Let test whichever cpu is used as default + def test_sbsaref_alpine_linux_default(self): """ - :avocado: tags=cpu:neoverse-n1 :avocado: tags=os:linux """ - self.boot_alpine_linux("neoverse-n1") + self.boot_alpine_linux() def test_sbsaref_alpine_linux_max_pauth_off(self): """ @@ -212,7 +214,7 @@ def test_sbsaref_openbsd73_cortex_a57(self): # This tests the whole boot chain from EFI to Userspace # We only boot a whole OS for the current top level CPU and GIC # Other test profiles should use more minimal boots - def boot_freebsd(self, cpu): + def boot_freebsd(self, cpu=False): self.fetch_firmware() img_url = ( @@ -225,12 +227,14 @@ def boot_freebsd(self, cpu): self.vm.set_console() self.vm.add_args( - "-cpu", - cpu, "-drive", f"file={img_path},format=raw", ) + # let allow test which will use default cpu of platform + if cpu: + self.vm.add_args("-cpu", cpu) + self.vm.launch() wait_for_console_pattern(self, "Welcome to FreeBSD!") @@ -241,13 +245,12 @@ def test_sbsaref_freebsd_cortex_a57(self): """ self.boot_freebsd("cortex-a57") - # We use Neoverse-N2 as default cpu - def test_sbsaref_freebsd_neoverse_n2(self): + # Let test whichever cpu is used as default + def test_sbsaref_freebsd_default(self): """ - :avocado: tags=cpu:neoverse-n2 :avocado: tags=os:freebsd """ - self.boot_freebsd("neoverse-n2") + self.boot_freebsd() def test_sbsaref_freebsd_max_pauth_off(self): """