From patchwork Tue Sep 10 09:48:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 826957 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp213748wrc; Tue, 10 Sep 2024 02:49:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6N5kqcvMd/WNEjSoLLF7GxxyHyeDJSuRu+Y44RifzBVIW+S76jBtag5jNfkcdeiHg3X2WMg==@linaro.org X-Google-Smtp-Source: AGHT+IHfip2C47/0WuOqinzwr+ZyjPZ+XSvPRylbELOlzB64ouU0Cs6CE2CTHD/hOJCKjGSrT0wL X-Received: by 2002:a05:6214:4293:b0:6c5:20c2:f33d with SMTP id 6a1803df08f44-6c532411aa5mr117967556d6.27.1725961756494; Tue, 10 Sep 2024 02:49:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725961756; cv=none; d=google.com; s=arc-20240605; b=cLbhIVb26yscyUSTrKJddKSQHlwryPV7jEX0CXjadxQAgxSMcGqHzporDEtDRxXZ+z 9ysq1v4id8gFkiOWe6LWlESzKayM2H6raVj1sok6aj81vDzk2wBozAHjaXTK882GO0To fvqbgiJWQhOUl6L1SbOnBy7U07FabaD8JlI3nEc9VK8Wcv0hPBJ3exOJNVji96BN4W2o ogYFXNz+hCJjWFCoY4szXvKFgK35v6mGWrc7uf6z/7neGF63qsN1qzJ0FLdEfJJdmwbW lyzPVE7QUg7dNO5Tj0kjFSUfrCvWFvYloYzl3svgJVUUyU2K0y39UgNId3TU6+0n0fPv YTOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=l6ZQE5ZWtT7OXRfOnOCNpDXHWa4sj8xB7xQMOguStzs=; fh=2XNni5tFqqNsYuVOJGxzVTMSzHzZnaSMOOPrr5cXMU4=; b=A97Z/Sfxg6ZxgMtLnm9P3Itx/w3DcvCQ5IiT0jbJRkernmPvbW3wMOeKi9Ez3nfliQ kNNPTrHR42RmUVQHVSja7xwAuYMQnCIuOSCERM2ltaqOZj+h3Wsj4XP0II7dS5aAw//z WfPQAC8w/MxzI24EqS6ImXrxcl63JmYThUIr/MOj0DctRgEPMPkSGT6q+VMl84H0OR3w kyGTmrw2O2D+hPGFM56F/O+c3G24lyo5+7nb1jHp8gkSWQHljU0cQm1V5TETt0ijM3wT 83votkkPEDjTER2xq3+iGUXRmxHok2AfEcSjL4ZNnbv1yweyYgrLu6yGj+d2zWNk6+Qz 4ZPA==; 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 6a1803df08f44-6c53432fddcsi74713516d6.14.2024.09.10.02.49.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 02:49:16 -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 1snxUD-0006Vl-Q8; Tue, 10 Sep 2024 05:48:37 -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 1snxUB-0006TU-NS; Tue, 10 Sep 2024 05:48:35 -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 1snxU9-0000M8-TU; Tue, 10 Sep 2024 05:48:35 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 7D7422602C9; Tue, 10 Sep 2024 11:48: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 gcrsLz_4zubZ; Tue, 10 Sep 2024 11:48:29 +0200 (CEST) Received: from applejack.lan (83.11.24.101.ipv4.supernova.orange.pl [83.11.24.101]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTPSA id C4026260898; Tue, 10 Sep 2024 11:48:28 +0200 (CEST) From: Marcin Juszkiewicz Date: Tue, 10 Sep 2024 11:48:08 +0200 Subject: [PATCH v5 1/4] tests: use default cpu for aarch64/sbsa-ref MIME-Version: 1.0 Message-Id: <20240910-b4-move-to-freebsd-v5-1-0fb66d803c93@linaro.org> References: <20240910-b4-move-to-freebsd-v5-0-0fb66d803c93@linaro.org> In-Reply-To: <20240910-b4-move-to-freebsd-v5-0-0fb66d803c93@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.14.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 want to run tests using default cpu without having to remember which Arm core is it. Change Neoverse-N1 (old default) test to use default cpu (Neoverse-N2 at the moment). Signed-off-by: Marcin Juszkiewicz --- tests/functional/test_aarch64_sbsaref.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/functional/test_aarch64_sbsaref.py b/tests/functional/test_aarch64_sbsaref.py index f31c2a60b6..528882f4fa 100755 --- a/tests/functional/test_aarch64_sbsaref.py +++ b/tests/functional/test_aarch64_sbsaref.py @@ -110,16 +110,17 @@ 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=None): self.fetch_firmware() iso_path = self.ASSET_ALPINE_ISO.fetch() self.vm.set_console() self.vm.add_args( - "-cpu", cpu, "-drive", f"file={iso_path},media=cdrom,format=raw", ) + if cpu: + self.vm.add_args("-cpu", cpu) self.vm.launch() wait_for_console_pattern(self, "Welcome to Alpine Linux 3.17") @@ -127,8 +128,8 @@ def boot_alpine_linux(self, cpu): def test_sbsaref_alpine_linux_cortex_a57(self): self.boot_alpine_linux("cortex-a57") - def test_sbsaref_alpine_linux_neoverse_n1(self): - self.boot_alpine_linux("neoverse-n1") + def test_sbsaref_alpine_linux_default_cpu(self): + self.boot_alpine_linux() def test_sbsaref_alpine_linux_max_pauth_off(self): self.boot_alpine_linux("max,pauth=off") @@ -148,16 +149,17 @@ def test_sbsaref_alpine_linux_max(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_openbsd73(self, cpu): + def boot_openbsd73(self, cpu=None): self.fetch_firmware() img_path = self.ASSET_OPENBSD_ISO.fetch() self.vm.set_console() self.vm.add_args( - "-cpu", cpu, "-drive", f"file={img_path},format=raw,snapshot=on", ) + if cpu: + self.vm.add_args("-cpu", cpu) self.vm.launch() wait_for_console_pattern(self, @@ -167,8 +169,8 @@ def boot_openbsd73(self, cpu): def test_sbsaref_openbsd73_cortex_a57(self): self.boot_openbsd73("cortex-a57") - def test_sbsaref_openbsd73_neoverse_n1(self): - self.boot_openbsd73("neoverse-n1") + def test_sbsaref_openbsd73_default_cpu(self): + self.boot_openbsd73() def test_sbsaref_openbsd73_max_pauth_off(self): self.boot_openbsd73("max,pauth=off")