From patchwork Thu Sep 19 13:10:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 829600 Delivered-To: patch@linaro.org Received: by 2002:adf:ebcc:0:b0:367:895a:4699 with SMTP id v12csp316328wrn; Thu, 19 Sep 2024 06:12:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGZ41s2hoxnISBeo/dSvPFUNJq+RpmiEzyxiqUraQ3RI2lEA1QshVaSTk3ZiW3yZQ2rxj6Bw==@linaro.org X-Google-Smtp-Source: AGHT+IEPsC8ApRvddFXVJkvxcCoHtzy05mvJZo8AKRBCk8xWiEydFFTKZ1sfjQJQkwMIczWggiAS X-Received: by 2002:a05:6358:71c6:b0:1b8:34fb:9696 with SMTP id e5c5f4694b2df-1bb14e3ee1amr712937155d.14.1726751529348; Thu, 19 Sep 2024 06:12:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726751529; cv=none; d=google.com; s=arc-20240605; b=fWRukJulsVFB7srkccNUi0Ul3SwhXqVkJe37hgZpVmcebo5urnK7wcMg5ovWYXWZIe OBDQI89q8ClbxgIiRMV7QixXZerQJHEoDPMJosNScGbXbljDrEfq8qlRG/++kE1Q1LB1 z6yQfe0GsFujlZ8G/qHIwKFYC4yPhVKMQxVjq6IDkHoQsaYnbPOaNzq4fyNkXhbf/Yaj aX6TB4I0vSQ8LfQwxzzpPezFP5iLokApJy/dZo+qXlQpkN1bCf6+NIrrRhkKKMfZHet1 M7osuEIhEvpTQeMlKz4664Lh5euD/pQY5X/4+9echhvCsl1ZE/p5ZDUulkEOXamr/mHg ne0w== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=3kQBlK5vS8qxp5uwCgrYf9PWvy5sZQf/8kseDk6bM60=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=YTR1N7SCkwPu85Gk/UPCvTDlzYnYoMjItSKO1FF34g3iBdmdWILky1ZzlFdVql1W6z qjuRq89I7E66+4k/5fdfX/uDUbMG2znYUuGAUKgGpsnL/+8aDz7gt1VkduUf20CpsXfI PxedfDF8e6CHzn/XossDuZUPcBZfaZWkr5U/DcVN0IFvaGCbmiOam/A5+3eCI12POkfT njRZXzrDFAf7sSteLcUQUnnCyoF4JvpqKzQNXe6y/RrOf0od+GcgiFpx0OCGgH4AX0eb JrDPATDYMgQhBvu4LEuZa81DiLT+A6C9AxhiPVwaTtacnhmNGNeDHHImNlJKvcdeJFXS CMdQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oRSwHkG3; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 71dfb90a1353d-5035b95ce19si2231617e0c.89.2024.09.19.06.12.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Sep 2024 06:12:09 -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; dkim=pass header.i=@linaro.org header.s=google header.b=oRSwHkG3; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srGwu-0006tW-Ub; Thu, 19 Sep 2024 09:11:56 -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 1srGwV-0005NJ-9R for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:11:32 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1srGwR-00014R-DZ for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:11:30 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-42cba8340beso12227225e9.1 for ; Thu, 19 Sep 2024 06:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726751486; x=1727356286; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3kQBlK5vS8qxp5uwCgrYf9PWvy5sZQf/8kseDk6bM60=; b=oRSwHkG385YBs8d6P5++mEnyXpnB3U8XXrRxlNnpauYGO45Ti5rr+CUhbzVgAYWWH6 5XYUXdwIhyltTJk5lXlqnYXSYkVr5ku5q6dDMUQZ+m3s1UjiA8jNA4KMYG271RE4ML/Z 9YSkeeHbu98U4f3eNBglxmP7C5GznVNLSXWfeLUQ+Vd6MlF/Lhfx5iRulkdfCulSl7HO V1B15hXlGwxXbYG4OZ1oRrWTQcPoZBpn0abHq4ymCwXVogorY0vyopHdkF0pr0kU/JTY bmaWqskdAfejLsF6PW6Q9OQBWUH4TMDTg8uS2k0a2A8eCKtHvrrsjzXOJhxmi1cKxPql wAtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726751486; x=1727356286; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3kQBlK5vS8qxp5uwCgrYf9PWvy5sZQf/8kseDk6bM60=; b=f7PdBmv1lqgWhYQ0F7fFmq4r8osLJJfdqTQi/KX27x0KzHFsGFH5OdjagqBo5RZWnN QJ4cEI2Df8MhDaPK7CinFmbXrIW+pMJV8McV6BYGIVdZKYnuh9zCER7RVcEc5YolizaP uSFzu+9+3Hsflcd7Yef/kFpPmOuxOaZkHNyismxjiwRB8Q7DBbLJblHVo0jkzSRFbIyR tP4unL/W2R/DX4CMvpNUFOQdSkf2XZmnoc1IdASZsIssg8KpjwOhG6xIuzspnANbW17q sIu/1pejcU7rXK1xl0mr5Vy2kbxK5GrWuL2BZFWOZ7NEgoRT8hz+ZctNSitnDiS+++dP U/uw== X-Gm-Message-State: AOJu0YxOQwRXmMQo1yd/BF0uM8PJJUCLrxBQMZCDyG6mk1pIMgkJAVmq AvdiPpA2eq3Ado6IF+JKAFFD0XfMX35oNqNC0ZJupZMplRP/wKOR+Lb4U3oeWQIvYs1BqYmtYK2 H X-Received: by 2002:a05:600c:1c9d:b0:42c:b377:3f55 with SMTP id 5b1f17b1804b1-42e743f263bmr19515345e9.3.1726751485895; Thu, 19 Sep 2024 06:11:25 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e754091d3sm21667845e9.10.2024.09.19.06.11.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2024 06:11:25 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 31/38] tests: use default cpu for aarch64/sbsa-ref Date: Thu, 19 Sep 2024 14:10:59 +0100 Message-Id: <20240919131106.3362543-32-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240919131106.3362543-1-peter.maydell@linaro.org> References: <20240919131106.3362543-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.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 From: Marcin Juszkiewicz 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 Message-id: 20240910-b4-move-to-freebsd-v5-1-0fb66d803c93@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- 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 f31c2a60b61..528882f4fa9 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")