mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/functional: Convert Aarch64 SBSA-Ref avocado tests

Browse Source 
Straight forward conversion. Since SBSA_FLASH files are not
tarballs, use lzma_uncompress() method.

Avocado used to set a timeout of 11 tests * 180s = 1980s.
Hopefully 600s should be sufficient.

Running on macOS Sonoma / Apple silicon M1:

  $ QEMU_TEST_TIMEOUT_EXPECTED=1 make check-functional-aarch64 V=1
  ▶ 1/5 test_aarch64_sbsaref.Aarch64SbsarefMachine.test_sbsaref_alpine_linux_max              OK
  ▶ 1/5 test_aarch64_sbsaref.Aarch64SbsarefMachine.test_sbsaref_alpine_linux_max_pauth_impdef OK
  ▶ 1/5 test_aarch64_sbsaref.Aarch64SbsarefMachine.test_sbsaref_alpine_linux_max_pauth_off    OK
  ▶ 1/5 test_aarch64_sbsaref.Aarch64SbsarefMachine.test_sbsaref_alpine_linux_neoverse_n1      OK
  ▶ 1/5 test_aarch64_sbsaref.Aarch64SbsarefMachine.test_sbsaref_edk2_firmware                 OK
  ▶ 1/5 test_aarch64_sbsaref.Aarch64SbsarefMachine.test_sbsaref_openbsd73_cortex_a57          OK
  ▶ 1/5 test_aarch64_sbsaref.Aarch64SbsarefMachine.test_sbsaref_openbsd73_max                 OK
  ▶ 1/5 test_aarch64_sbsaref.Aarch64SbsarefMachine.test_sbsaref_openbsd73_max_pauth_impdef    OK
  ▶ 1/5 test_aarch64_sbsaref.Aarch64SbsarefMachine.test_sbsaref_openbsd73_max_pauth_off       OK
  ▶ 1/5 test_aarch64_sbsaref.Aarch64SbsarefMachine.test_sbsaref_openbsd73_neoverse_n1         OK
  1/5 qemu:func-thorough+func-aarch64-thorough+thorough / func-aarch64-aarch64_sbsaref        OK   241.79s  11 subtests passed
  ...

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240823131614.10269-1-philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Message-ID: <20240830133841.142644-35-thuth@redhat.com>
[thuth: remove remaining Avocado tags]
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-08-30 15:38:28 +02:00 committed by Thomas Huth
parent ef83aea0a3
commit 8f16cd80fc
3 changed files with 55 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -970,7 +970,7 @@ F: hw/misc/sbsa_ec.c
F: hw/watchdog/sbsa_gwdt.c F: hw/watchdog/sbsa_gwdt.c
F: include/hw/watchdog/sbsa_gwdt.h F: include/hw/watchdog/sbsa_gwdt.h
F: docs/system/arm/sbsa.rst F: docs/system/arm/sbsa.rst
F: tests/avocado/machine_aarch64_sbsaref.py F: tests/functional/test_aarch64_sbsaref.py
Sharp SL-5500 (Collie) PDA Sharp SL-5500 (Collie) PDA
M: Peter Maydell <peter.maydell@linaro.org> M: Peter Maydell <peter.maydell@linaro.org>

5
tests/functional/meson.build
View File

@ -11,6 +11,7 @@ endif
# Timeouts for individual tests that can be slow e.g. with debugging enabled # Timeouts for individual tests that can be slow e.g. with debugging enabled
test_timeouts = { test_timeouts = {
'aarch64_sbsaref' : 600,
'acpi_bits' : 240, 'acpi_bits' : 240,
'netdev_ethtool' : 180, 'netdev_ethtool' : 180,
'ppc_40p' : 240, 'ppc_40p' : 240,
@ -32,6 +33,10 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [ tests_generic_bsduser = [
] ]
tests_aarch64_system_thorough = [
'aarch64_sbsaref',
]
tests_arm_system_thorough = [ tests_arm_system_thorough = [
'arm_canona1100', 'arm_canona1100',
'arm_integratorcp', 'arm_integratorcp',

148
tests/avocado/machine_aarch64_sbsaref.py → tests/functional/test_aarch64_sbsaref.py Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env python3
#
# Functional test that boots a Linux kernel and checks the console # Functional test that boots a Linux kernel and checks the console
# #
# SPDX-FileCopyrightText: 2023-2024 Linaro Ltd. # SPDX-FileCopyrightText: 2023-2024 Linaro Ltd.
@ -8,26 +10,31 @@
import os import os
from avocado import skipUnless from qemu_test import QemuSystemTest, Asset
from avocado.utils import archive from qemu_test import wait_for_console_pattern
from qemu_test import interrupt_interactive_console_until_pattern
from avocado_qemu import QemuSystemTest from qemu_test.utils import lzma_uncompress
from avocado_qemu import wait_for_console_pattern from unittest import skipUnless
from avocado_qemu import interrupt_interactive_console_until_pattern
class Aarch64SbsarefMachine(QemuSystemTest): class Aarch64SbsarefMachine(QemuSystemTest):
""" """
:avocado: tags=arch:aarch64
:avocado: tags=machine:sbsa-ref
:avocado: tags=accel:tcg
As firmware runs at a higher privilege level than the hypervisor we As firmware runs at a higher privilege level than the hypervisor we
can only run these tests under TCG emulation. can only run these tests under TCG emulation.
""" """
timeout = 180 timeout = 180
ASSET_FLASH0 = Asset(
('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
'20240619-148232/edk2/SBSA_FLASH0.fd.xz'),
'0c954842a590988f526984de22e21ae0ab9cb351a0c99a8a58e928f0c7359cf7')
ASSET_FLASH1 = Asset(
('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
'20240619-148232/edk2/SBSA_FLASH1.fd.xz'),
'c6ec39374c4d79bb9e9cdeeb6db44732d90bb4a334cec92002b3f4b9cac4b5ee')
def fetch_firmware(self): def fetch_firmware(self):
""" """
Flash volumes generated using: Flash volumes generated using:
@ -44,47 +51,31 @@ class Aarch64SbsarefMachine(QemuSystemTest):
""" """
# Secure BootRom (TF-A code) # Secure BootRom (TF-A code)
fs0_xz_url = ( fs0_xz_path = self.ASSET_FLASH0.fetch()
"https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
"20240619-148232/edk2/SBSA_FLASH0.fd.xz"
)
fs0_xz_hash = "0c954842a590988f526984de22e21ae0ab9cb351a0c99a8a58e928f0c7359cf7"
tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash,
algorithm='sha256')
archive.extract(tar_xz_path, self.workdir)
fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd") fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd")
lzma_uncompress(fs0_xz_path, fs0_path)
# Non-secure rom (UEFI and EFI variables) # Non-secure rom (UEFI and EFI variables)
fs1_xz_url = ( fs1_xz_path = self.ASSET_FLASH1.fetch()
"https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
"20240619-148232/edk2/SBSA_FLASH1.fd.xz"
)
fs1_xz_hash = "c6ec39374c4d79bb9e9cdeeb6db44732d90bb4a334cec92002b3f4b9cac4b5ee"
tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash,
algorithm='sha256')
archive.extract(tar_xz_path, self.workdir)
fs1_path = os.path.join(self.workdir, "SBSA_FLASH1.fd") fs1_path = os.path.join(self.workdir, "SBSA_FLASH1.fd")
lzma_uncompress(fs1_xz_path, fs1_path)
for path in [fs0_path, fs1_path]: for path in [fs0_path, fs1_path]:
with open(path, "ab+") as fd: with open(path, "ab+") as fd:
fd.truncate(256 << 20) # Expand volumes to 256MiB fd.truncate(256 << 20) # Expand volumes to 256MiB
self.set_machine('sbsa-ref')
self.vm.set_console() self.vm.set_console()
self.vm.add_args( self.vm.add_args(
"-drive", "-drive", f"if=pflash,file={fs0_path},format=raw",
f"if=pflash,file={fs0_path},format=raw", "-drive", f"if=pflash,file={fs1_path},format=raw",
"-drive",
f"if=pflash,file={fs1_path},format=raw",
"-machine",
"sbsa-ref",
) )
def test_sbsaref_edk2_firmware(self): def test_sbsaref_edk2_firmware(self):
"""
:avocado: tags=cpu:cortex-a57
"""
self.fetch_firmware() self.fetch_firmware()
self.vm.add_args('-cpu', 'cortex-a57')
self.vm.launch() self.vm.launch()
# TF-A boot sequence: # TF-A boot sequence:
@ -110,87 +101,62 @@ class Aarch64SbsarefMachine(QemuSystemTest):
wait_for_console_pattern(self, "UEFI firmware (version 1.0") wait_for_console_pattern(self, "UEFI firmware (version 1.0")
interrupt_interactive_console_until_pattern(self, "QEMU SBSA-REF Machine") interrupt_interactive_console_until_pattern(self, "QEMU SBSA-REF Machine")
ASSET_ALPINE_ISO = Asset(
('https://dl-cdn.alpinelinux.org/'
'alpine/v3.17/releases/aarch64/alpine-standard-3.17.2-aarch64.iso'),
'5a36304ecf039292082d92b48152a9ec21009d3a62f459de623e19c4bd9dc027')
# 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):
self.fetch_firmware() self.fetch_firmware()
iso_url = ( iso_path = self.ASSET_ALPINE_ISO.fetch()
"https://dl-cdn.alpinelinux.org/"
"alpine/v3.17/releases/aarch64/alpine-standard-3.17.2-aarch64.iso"
)
iso_hash = "5a36304ecf039292082d92b48152a9ec21009d3a62f459de623e19c4bd9dc027"
iso_path = self.fetch_asset(iso_url, algorithm="sha256", asset_hash=iso_hash)
self.vm.set_console() self.vm.set_console()
self.vm.add_args( self.vm.add_args(
"-cpu", "-cpu", cpu,
cpu, "-drive", f"file={iso_path},media=cdrom,format=raw",
"-drive",
f"file={iso_path},media=cdrom,format=raw",
) )
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")
def test_sbsaref_alpine_linux_cortex_a57(self): def test_sbsaref_alpine_linux_cortex_a57(self):
"""
:avocado: tags=cpu:cortex-a57
:avocado: tags=os:linux
"""
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_neoverse_n1(self):
"""
:avocado: tags=cpu:neoverse-n1
:avocado: tags=os:linux
"""
self.boot_alpine_linux("neoverse-n1") self.boot_alpine_linux("neoverse-n1")
def test_sbsaref_alpine_linux_max_pauth_off(self): def test_sbsaref_alpine_linux_max_pauth_off(self):
"""
:avocado: tags=cpu:max
:avocado: tags=os:linux
"""
self.boot_alpine_linux("max,pauth=off") self.boot_alpine_linux("max,pauth=off")
def test_sbsaref_alpine_linux_max_pauth_impdef(self): def test_sbsaref_alpine_linux_max_pauth_impdef(self):
"""
:avocado: tags=cpu:max
:avocado: tags=os:linux
"""
self.boot_alpine_linux("max,pauth-impdef=on") self.boot_alpine_linux("max,pauth-impdef=on")
@skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') @skipUnless(os.getenv('QEMU_TEST_TIMEOUT_EXPECTED'), 'Test might timeout')
def test_sbsaref_alpine_linux_max(self): def test_sbsaref_alpine_linux_max(self):
"""
:avocado: tags=cpu:max
:avocado: tags=os:linux
"""
self.boot_alpine_linux("max") self.boot_alpine_linux("max")
ASSET_OPENBSD_ISO = Asset(
('https://cdn.openbsd.org/pub/OpenBSD/7.3/arm64/miniroot73.img'),
'7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755c44b9c129b707e5')
# 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):
self.fetch_firmware() self.fetch_firmware()
img_url = ( img_path = self.ASSET_OPENBSD_ISO.fetch()
"https://cdn.openbsd.org/pub/OpenBSD/7.3/arm64/miniroot73.img"
)
img_hash = "7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755c44b9c129b707e5"
img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash)
self.vm.set_console() self.vm.set_console()
self.vm.add_args( self.vm.add_args(
"-cpu", "-cpu", cpu,
cpu, "-drive", f"file={img_path},format=raw,snapshot=on",
"-drive",
f"file={img_path},format=raw,snapshot=on",
) )
self.vm.launch() self.vm.launch()
@ -199,38 +165,22 @@ class Aarch64SbsarefMachine(QemuSystemTest):
" 7.3 installation program.") " 7.3 installation program.")
def test_sbsaref_openbsd73_cortex_a57(self): def test_sbsaref_openbsd73_cortex_a57(self):
"""
:avocado: tags=cpu:cortex-a57
:avocado: tags=os:openbsd
"""
self.boot_openbsd73("cortex-a57") self.boot_openbsd73("cortex-a57")
def test_sbsaref_openbsd73_neoverse_n1(self): def test_sbsaref_openbsd73_neoverse_n1(self):
"""
:avocado: tags=cpu:neoverse-n1
:avocado: tags=os:openbsd
"""
self.boot_openbsd73("neoverse-n1") self.boot_openbsd73("neoverse-n1")
def test_sbsaref_openbsd73_max_pauth_off(self): def test_sbsaref_openbsd73_max_pauth_off(self):
"""
:avocado: tags=cpu:max
:avocado: tags=os:openbsd
"""
self.boot_openbsd73("max,pauth=off") self.boot_openbsd73("max,pauth=off")
@skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') @skipUnless(os.getenv('QEMU_TEST_TIMEOUT_EXPECTED'), 'Test might timeout')
def test_sbsaref_openbsd73_max_pauth_impdef(self): def test_sbsaref_openbsd73_max_pauth_impdef(self):
"""
:avocado: tags=cpu:max
:avocado: tags=os:openbsd
"""
self.boot_openbsd73("max,pauth-impdef=on") self.boot_openbsd73("max,pauth-impdef=on")
@skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') @skipUnless(os.getenv('QEMU_TEST_TIMEOUT_EXPECTED'), 'Test might timeout')
def test_sbsaref_openbsd73_max(self): def test_sbsaref_openbsd73_max(self):
"""
:avocado: tags=cpu:max
:avocado: tags=os:openbsd
"""
self.boot_openbsd73("max") self.boot_openbsd73("max")
if __name__ == '__main__':
QemuSystemTest.main()