From patchwork Mon Jun 24 16:20:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 807046 Delivered-To: patch@linaro.org Received: by 2002:a5d:508d:0:b0:362:4979:7f74 with SMTP id a13csp1963135wrt; Mon, 24 Jun 2024 09:22:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVuZ5oJT1OJZJzLoCEL8sy0oGU6Od4C+VfV8i9GvCFjU2F9jmgY5W7KqMu6qXnEzetPbyiiNwe6YtqUOBdChaVc X-Google-Smtp-Source: AGHT+IFV7Nzy5JN/rjLK6MKZJnTHkKsrD07B1WZXV1TJMq1/NbtMQNuoleglYHkiIbIt89jCLDNi X-Received: by 2002:a05:620a:29d1:b0:79b:eaab:abe5 with SMTP id af79cd13be357-79beaabac47mr519827985a.15.1719246147242; Mon, 24 Jun 2024 09:22:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719246147; cv=none; d=google.com; s=arc-20160816; b=hYbKFStpBZBE1yJiYbrfFwRXSLoQHQm7+6ZrPgm4wP877C6kxEVqylGwDv7JNIoBKx EHny9UFMPiObM5BEvvEgnON5onOPDXWampu54M5jGfIoqBscfR49j1MTFpatbjjBFJtn e3+8AW4GsVwxbQ+LkvGgEzTCG0sNBiXxZnz3wbQMM+8DsRSA8DFOfboqj1ISOb3HzNGq 3wRX2BCHZwCG1JZ2BBuklYAEFzyG70ZMFHbQdBZNbaMaboeMYtdu06d9swCZzv92Ckv4 JweOU8WovjUPlFH+8KX7uImJnSNSMZjcHTHqfBAMkGz5WOW0/uikH71noKiET0zoESkj ftrg== 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=mAmKJrbRPSG1UFYFfYa/xV/POnJjM3koaMSiwhbNnsk=; fh=2XNni5tFqqNsYuVOJGxzVTMSzHzZnaSMOOPrr5cXMU4=; b=QdHqo8raArHO/N7vIeWWuvVKmJk7WaN59LK9Hu2qaPnddCIHmH732KCb99lq9KR4Ra q/LJMH/smL5oHy1NoFsCz+Pc+tPnYq/1ozNfgIZpON4ZLwg0MosUZvfiboTh4a+KZBYN F8tYUzX2ZI1SMu1jOJkbA3sJZH2J/OGIk7zEx0Kyj83Gd/kLcoxtMSKle9roRZ66hgMH wPBNZT6w4ERqs0ivWPS26kjn7JU04I9j3yTf5iGvZPxEx7YcaLNOpvYQLlEaX2EC9LBl 0A44+FymmO2/ysESRCo5a0rbhr4NJYcf44cZzw96GPnoNOQVvZbEbXE4WP4riuFWydY6 hLEQ==; 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 af79cd13be357-79bce91433dsi894264185a.370.2024.06.24.09.22.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jun 2024 09:22:27 -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 1sLmRI-0000H6-Tl; Mon, 24 Jun 2024 12:21:08 -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 1sLmRD-0000FA-Ro; Mon, 24 Jun 2024 12:21:04 -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 1sLmRB-00023T-8H; Mon, 24 Jun 2024 12:21:03 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 8A4F126071B; Mon, 24 Jun 2024 18:20:57 +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 NPAEIO_mzgcV; Mon, 24 Jun 2024 18:20:55 +0200 (CEST) Received: from applejack.lan (83.11.22.244.ipv4.supernova.orange.pl [83.11.22.244]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTPSA id 0C348261A96; Mon, 24 Jun 2024 18:20:54 +0200 (CEST) From: Marcin Juszkiewicz Date: Mon, 24 Jun 2024 18:20:44 +0200 Subject: [PATCH v3 2/2] tests/avocado: add test for default sbsa-ref cpu MIME-Version: 1.0 Message-Id: <20240624-b4-move-to-freebsd-v3-2-71496bf119d4@linaro.org> References: <20240624-b4-move-to-freebsd-v3-0-71496bf119d4@linaro.org> In-Reply-To: <20240624-b4-move-to-freebsd-v3-0-71496bf119d4@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 bb2c098aac..43bb1860e0 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -115,7 +115,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 = ( @@ -128,12 +128,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") @@ -144,12 +146,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): """ @@ -214,7 +216,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 = ( @@ -227,12 +229,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!") @@ -243,13 +247,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): """