From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>
Subject: [PULL 17/21] tests/functional: Convert the Avocado mips64 tuxrun test
Date: Mon, 21 Oct 2024 13:34:54 +0200 [thread overview]
Message-ID: <20241021113500.122500-18-thuth@redhat.com> (raw)
In-Reply-To: <20241021113500.122500-1-thuth@redhat.com>
Move the test into a new file so that it can be run via
qemu-system-mips64 in the functional framework.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20241011131937.377223-14-thuth@redhat.com>
---
tests/avocado/tuxrun_baselines.py | 17 -------------
tests/functional/meson.build | 4 +++
tests/functional/test_mips64_tuxrun.py | 35 ++++++++++++++++++++++++++
3 files changed, 39 insertions(+), 17 deletions(-)
create mode 100755 tests/functional/test_mips64_tuxrun.py
diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py
index d45c2ce35e..e0e6a56067 100644
--- a/tests/avocado/tuxrun_baselines.py
+++ b/tests/avocado/tuxrun_baselines.py
@@ -192,23 +192,6 @@ def common_tuxrun(self,
# --kernel https://storage.tuxboot.com/{TUXBOOT}/{IMAGE}
#
- def test_mips64(self):
- """
- :avocado: tags=arch:mips64
- :avocado: tags=machine:malta
- :avocado: tags=tuxboot:mips64
- :avocado: tags=endian:big
- :avocado: tags=image:vmlinux
- :avocado: tags=root:sda
- :avocado: tags=shutdown:nowait
- """
- sums = { "rootfs.ext4.zst" :
- "69d91eeb04df3d8d172922c6993bb37d4deeb6496def75d8580f6f9de3e431da",
- "vmlinux" :
- "09010e51e4b8bcbbd2494786ffb48eca78f228e96e5c5438344b0eac4029dc61" }
-
- self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
-
def test_mips64el(self):
"""
:avocado: tags=arch:mips64el
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 813237e412..eef48edf52 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -100,6 +100,10 @@ tests_mipsel_system_thorough = [
'mipsel_tuxrun',
]
+tests_mips64_system_thorough = [
+ 'mips64_tuxrun',
+]
+
tests_mips64el_system_thorough = [
'mips64el_fuloong2e',
'mips64el_loongson3v',
diff --git a/tests/functional/test_mips64_tuxrun.py b/tests/functional/test_mips64_tuxrun.py
new file mode 100755
index 0000000000..54af1ae794
--- /dev/null
+++ b/tests/functional/test_mips64_tuxrun.py
@@ -0,0 +1,35 @@
+#!/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 TuxRunMips64Test(TuxRunBaselineTest):
+
+ ASSET_MIPS64_KERNEL = Asset(
+ 'https://storage.tuxboot.com/20230331/mips64/vmlinux',
+ '09010e51e4b8bcbbd2494786ffb48eca78f228e96e5c5438344b0eac4029dc61')
+ ASSET_MIPS64_ROOTFS = Asset(
+ 'https://storage.tuxboot.com/20230331/mips64/rootfs.ext4.zst',
+ '69d91eeb04df3d8d172922c6993bb37d4deeb6496def75d8580f6f9de3e431da')
+
+ def test_mips64(self):
+ self.set_machine('malta')
+ self.root="sda"
+ self.wait_for_shutdown=False
+ self.common_tuxrun(kernel_asset=self.ASSET_MIPS64_KERNEL,
+ rootfs_asset=self.ASSET_MIPS64_ROOTFS,
+ drive="driver=ide-hd,bus=ide.0,unit=0")
+
+if __name__ == '__main__':
+ TuxRunBaselineTest.main()
--
2.47.0
next prev parent reply other threads:[~2024-10-21 11:38 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-21 11:34 [PULL 00/21] Test updates (tuxrun tests, new QTest maintainer, ...) Thomas Huth
2024-10-21 11:34 ` [PULL 01/21] tests/vm: update openbsd image to 7.6 Thomas Huth
2024-10-21 11:34 ` [PULL 02/21] tests/qtest: Raise the ide-test timeout Thomas Huth
2024-10-21 11:34 ` [PULL 03/21] MAINTAINERS: A new maintainer for the qtests Thomas Huth
2024-10-21 11:34 ` [PULL 04/21] hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge Thomas Huth
2024-10-21 11:34 ` [PULL 05/21] tests/functional: Add a base class for the TuxRun tests Thomas Huth
2024-10-21 11:34 ` [PULL 06/21] tests/functional: Convert the Avocado ppc64 tuxrun tests Thomas Huth
2024-10-21 11:34 ` [PULL 07/21] tests/functional: Convert the Avocado aarch64 " Thomas Huth
2024-10-21 11:34 ` [PULL 08/21] tests/functional: Convert the Avocado sparc64 tuxrun test Thomas Huth
2024-10-21 11:34 ` [PULL 09/21] tests/functional: Convert the Avocado s390x " Thomas Huth
2024-10-21 11:34 ` [PULL 10/21] tests/functional: Convert the Avocado arm tuxrun tests Thomas Huth
2024-10-21 11:34 ` [PULL 11/21] tests/functional: Convert the Avocado riscv32 " Thomas Huth
2024-10-21 11:34 ` [PULL 12/21] tests/functional: Convert the Avocado riscv64 " Thomas Huth
2024-10-21 11:34 ` [PULL 13/21] tests/functional: Convert the Avocado i386 tuxrun test Thomas Huth
2024-10-21 11:34 ` [PULL 14/21] tests/functional: Convert the Avocado x86_64 " Thomas Huth
2024-10-21 11:34 ` [PULL 15/21] tests/functional: Convert the Avocado mips " Thomas Huth
2024-10-21 11:34 ` [PULL 16/21] tests/functional: Convert the Avocado mipsel " Thomas Huth
2024-10-21 11:34 ` Thomas Huth [this message]
2024-10-21 11:34 ` [PULL 18/21] tests/functional: Convert the Avocado mips64el " Thomas Huth
2024-10-21 11:34 ` [PULL 19/21] tests/functional: Convert the Avocado ppc32 " Thomas Huth
2024-10-21 11:34 ` [PULL 20/21] Revert "hw/sh4/r2d: Realize IDE controller before accessing it" Thomas Huth
2024-10-21 11:34 ` [PULL 21/21] tests/functional: Convert the Avocado sh4 tuxrun test Thomas Huth
2024-10-21 13:00 ` [PULL 00/21] Test updates (tuxrun tests, new QTest maintainer, ...) Peter Maydell
2024-10-21 13:18 ` Thomas Huth
2024-10-21 13:55 ` Thomas Huth
2024-10-21 13:59 ` Peter Maydell
2024-10-21 14:11 ` Thomas Huth
2024-10-21 15:39 ` Peter Maydell
2024-10-21 16:03 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241021113500.122500-18-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).