motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: use default cpu for aarch64/sbsa-ref

Browse source 
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 <marcin.juszkiewicz@linaro.org>
Message-id: 20240910-b4-move-to-freebsd-v5-1-0fb66d803c93@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Marcin Juszkiewicz 2024-09-10 11:48:08 +02:00 • committed by Peter Maydell
parent 6cce0dcc6f
commit e6436febb0
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/functional/test_aarch64_sbsaref.py
View file

@ -110,16 +110,17 @@ class Aarch64SbsarefMachine(QemuSystemTest):
# This tests the whole boot chain from EFI to Userspace # This tests the whole boot chain from EFI to Userspace
# We only boot a whole OS for the current top level CPU and GIC # We only boot a whole OS for the current top level CPU and GIC
# Other test profiles should use more minimal boots # Other test profiles should use more minimal boots
def boot_alpine_linux(self, cpu): def boot_alpine_linux(self, cpu=None):
self.fetch_firmware() self.fetch_firmware()
iso_path = self.ASSET_ALPINE_ISO.fetch() iso_path = self.ASSET_ALPINE_ISO.fetch()
self.vm.set_console() self.vm.set_console()
self.vm.add_args( self.vm.add_args(
"-cpu", cpu,
"-drive", f"file={iso_path},media=cdrom,format=raw", "-drive", f"file={iso_path},media=cdrom,format=raw",
) )
if cpu:
self.vm.add_args("-cpu", cpu)
self.vm.launch() self.vm.launch()
wait_for_console_pattern(self, "Welcome to Alpine Linux 3.17") wait_for_console_pattern(self, "Welcome to Alpine Linux 3.17")
@ -127,8 +128,8 @@ class Aarch64SbsarefMachine(QemuSystemTest):
def test_sbsaref_alpine_linux_cortex_a57(self): def test_sbsaref_alpine_linux_cortex_a57(self):
self.boot_alpine_linux("cortex-a57") self.boot_alpine_linux("cortex-a57")
def test_sbsaref_alpine_linux_neoverse_n1(self): def test_sbsaref_alpine_linux_default_cpu(self):
self.boot_alpine_linux("neoverse-n1") self.boot_alpine_linux()
def test_sbsaref_alpine_linux_max_pauth_off(self): def test_sbsaref_alpine_linux_max_pauth_off(self):
self.boot_alpine_linux("max,pauth=off") self.boot_alpine_linux("max,pauth=off")
@ -148,16 +149,17 @@ class Aarch64SbsarefMachine(QemuSystemTest):
# This tests the whole boot chain from EFI to Userspace # This tests the whole boot chain from EFI to Userspace
# We only boot a whole OS for the current top level CPU and GIC # We only boot a whole OS for the current top level CPU and GIC
# Other test profiles should use more minimal boots # Other test profiles should use more minimal boots
def boot_openbsd73(self, cpu): def boot_openbsd73(self, cpu=None):
self.fetch_firmware() self.fetch_firmware()
img_path = self.ASSET_OPENBSD_ISO.fetch() img_path = self.ASSET_OPENBSD_ISO.fetch()
self.vm.set_console() self.vm.set_console()
self.vm.add_args( self.vm.add_args(
"-cpu", cpu,
"-drive", f"file={img_path},format=raw,snapshot=on", "-drive", f"file={img_path},format=raw,snapshot=on",
) )
if cpu:
self.vm.add_args("-cpu", cpu)
self.vm.launch() self.vm.launch()
wait_for_console_pattern(self, wait_for_console_pattern(self,
@ -167,8 +169,8 @@ class Aarch64SbsarefMachine(QemuSystemTest):
def test_sbsaref_openbsd73_cortex_a57(self): def test_sbsaref_openbsd73_cortex_a57(self):
self.boot_openbsd73("cortex-a57") self.boot_openbsd73("cortex-a57")
def test_sbsaref_openbsd73_neoverse_n1(self): def test_sbsaref_openbsd73_default_cpu(self):
self.boot_openbsd73("neoverse-n1") self.boot_openbsd73()
def test_sbsaref_openbsd73_max_pauth_off(self): def test_sbsaref_openbsd73_max_pauth_off(self):
self.boot_openbsd73("max,pauth=off") self.boot_openbsd73("max,pauth=off")