@@ -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):
"""
@@ -178,7 +180,7 @@ 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_freebsd(self, cpu):
+ def boot_freebsd(self, cpu=False):
self.fetch_firmware()
img_url = (
@@ -191,12 +193,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!")
@@ -207,13 +211,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):
"""
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 <marcin.juszkiewicz@linaro.org> --- tests/avocado/machine_aarch64_sbsaref.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)