diff options
| author | Thomas Huth <thuth@redhat.com> | 2024-10-11 15:19:21 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2024-10-21 16:28:59 +0200 |
| commit | 116667aa60cd6d44b7f681530620a2ffc43256f5 (patch) | |
| tree | 7b96740ac5b2b1150161b6141ef2bbaa054be676 | |
| parent | d9dff75b08237ef41b4c1e3a2d02f4e1bcae826e (diff) | |
| download | qemu-116667aa60cd6d44b7f681530620a2ffc43256f5.zip qemu-116667aa60cd6d44b7f681530620a2ffc43256f5.tar.gz qemu-116667aa60cd6d44b7f681530620a2ffc43256f5.tar.bz2 | |
tests/functional: Convert the Avocado sparc64 tuxrun test
Move the test to a new file so that it can be run via
qemu-system-sparc64 in the functional framework.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20241011131937.377223-5-thuth@redhat.com>
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | tests/avocado/tuxrun_baselines.py | 16 | ||||
| -rw-r--r-- | tests/functional/meson.build | 1 | ||||
| -rwxr-xr-x | tests/functional/test_sparc64_tuxrun.py | 34 |
4 files changed, 36 insertions, 16 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8f4a58f..efc2a2c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1663,6 +1663,7 @@ F: hw/pci-bridge/simba.c F: include/hw/pci-bridge/simba.h F: pc-bios/openbios-sparc64 F: tests/functional/test_sparc64_sun4u.py +F: tests/functional/test_sparc64_tuxrun.py Sun4v M: Artyom Tarasenko <atar4qemu@gmail.com> diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py index 56c8bdb..1e30fb0 100644 --- a/tests/avocado/tuxrun_baselines.py +++ b/tests/avocado/tuxrun_baselines.py @@ -493,22 +493,6 @@ class TuxRunBaselineTest(QemuSystemTest): exec_command_and_wait_for_pattern(self, 'halt', "reboot: System halted") - def test_sparc64(self): - """ - :avocado: tags=arch:sparc64 - :avocado: tags=tuxboot:sparc64 - :avocado: tags=image:vmlinux - :avocado: tags=root:sda - :avocado: tags=shutdown:nowait - """ - - sums = { "rootfs.ext4.zst" : - "ad2f1dc436ab51583543d25d2c210cab478645d47078d30d129a66ab0e281d76", - "vmlinux" : - "e34313e4325ff21deaa3d38a502aa09a373ef62b9bd4d7f8f29388b688225c55" } - - self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0") - def test_x86_64(self): """ :avocado: tags=arch:x86_64 diff --git a/tests/functional/meson.build b/tests/functional/meson.build index c90c025..98a5643 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -140,6 +140,7 @@ tests_sparc_system_thorough = [ tests_sparc64_system_thorough = [ 'sparc64_sun4u', + 'sparc64_tuxrun', ] tests_x86_64_system_quick = [ diff --git a/tests/functional/test_sparc64_tuxrun.py b/tests/functional/test_sparc64_tuxrun.py new file mode 100755 index 0000000..1c2c005 --- /dev/null +++ b/tests/functional/test_sparc64_tuxrun.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +# +# Functional test that boots known good tuxboot images the same way +# that tuxrun (www.tuxrun.org) does. This tool is used by things like +# the LKFT project to run regression tests on kernels. +# +# Copyright (c) 2023 Linaro Ltd. +# +# Author: +# Alex Bennée <alex.bennee@linaro.org> +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from qemu_test.tuxruntest import TuxRunBaselineTest + +class TuxRunSparc64Test(TuxRunBaselineTest): + + ASSET_SPARC64_KERNEL = Asset( + 'https://storage.tuxboot.com/20230331/sparc64/vmlinux', + 'e34313e4325ff21deaa3d38a502aa09a373ef62b9bd4d7f8f29388b688225c55') + ASSET_SPARC64_ROOTFS = Asset( + 'https://storage.tuxboot.com/20230331/sparc64/rootfs.ext4.zst', + 'ad2f1dc436ab51583543d25d2c210cab478645d47078d30d129a66ab0e281d76') + + def test_sparc64(self): + self.root='sda' + self.wait_for_shutdown=False + self.common_tuxrun(kernel_asset=self.ASSET_SPARC64_KERNEL, + rootfs_asset=self.ASSET_SPARC64_ROOTFS, + drive="driver=ide-hd,bus=ide.0,unit=0") + +if __name__ == '__main__': + TuxRunBaselineTest.main() |