From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>
Subject: [PULL v2 15/20] tests/functional: Convert the Avocado mipsel tuxrun test
Date: Mon, 21 Oct 2024 18:11:49 +0200 [thread overview]
Message-ID: <20241021161156.176427-6-thuth@redhat.com> (raw)
In-Reply-To: <20241021161156.176427-1-thuth@redhat.com>
Move the test into a new file so that it can be run via
qemu-system-mipsel in the functional framework.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20241011131937.377223-13-thuth@redhat.com>
---
tests/avocado/tuxrun_baselines.py | 17 ------------
tests/functional/meson.build | 1 +
tests/functional/test_mipsel_tuxrun.py | 36 ++++++++++++++++++++++++++
3 files changed, 37 insertions(+), 17 deletions(-)
create mode 100755 tests/functional/test_mipsel_tuxrun.py
diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py
index ed6c2ce0d4..e6a6fe229e 100644
--- a/tests/avocado/tuxrun_baselines.py
+++ b/tests/avocado/tuxrun_baselines.py
@@ -223,23 +223,6 @@ def test_arm64be(self):
"e6ffd8813c8a335bc15728f2835f90539c84be7f8f5f691a8b01451b47fb4bd7"}
self.common_tuxrun(csums=sums)
- def test_mips32el(self):
- """
- :avocado: tags=arch:mipsel
- :avocado: tags=machine:malta
- :avocado: tags=cpu:mips32r6-generic
- :avocado: tags=tuxboot:mips32el
- :avocado: tags=image:vmlinux
- :avocado: tags=root:sda
- :avocado: tags=shutdown:nowait
- """
- sums = { "rootfs.ext4.zst" :
- "e799768e289fd69209c21f4dacffa11baea7543d5db101e8ce27e3bc2c41d90e",
- "vmlinux" :
- "8573867c68a8443db8de6d08bb33fb291c189ca2ca671471d3973a3e712096a3" }
-
- self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
-
def test_mips64(self):
"""
:avocado: tags=arch:mips64
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 00591fbcba..7465c4bac6 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -95,6 +95,7 @@ tests_mips_system_thorough = [
tests_mipsel_system_thorough = [
'mipsel_malta',
+ 'mipsel_tuxrun',
]
tests_mips64el_system_thorough = [
diff --git a/tests/functional/test_mipsel_tuxrun.py b/tests/functional/test_mipsel_tuxrun.py
new file mode 100755
index 0000000000..2965bbd913
--- /dev/null
+++ b/tests/functional/test_mipsel_tuxrun.py
@@ -0,0 +1,36 @@
+#!/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 TuxRunMipsELTest(TuxRunBaselineTest):
+
+ ASSET_MIPSEL_KERNEL = Asset(
+ 'https://storage.tuxboot.com/20230331/mips32el/vmlinux',
+ '8573867c68a8443db8de6d08bb33fb291c189ca2ca671471d3973a3e712096a3')
+ ASSET_MIPSEL_ROOTFS = Asset(
+ 'https://storage.tuxboot.com/20230331/mips32el/rootfs.ext4.zst',
+ 'e799768e289fd69209c21f4dacffa11baea7543d5db101e8ce27e3bc2c41d90e')
+
+ def test_mips32el(self):
+ self.set_machine('malta')
+ self.cpu="mips32r6-generic"
+ self.root="sda"
+ self.wait_for_shutdown=False
+ self.common_tuxrun(kernel_asset=self.ASSET_MIPSEL_KERNEL,
+ rootfs_asset=self.ASSET_MIPSEL_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 16:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-21 16:11 [PULL v2 00/20] Test updates (tuxrun tests, new QTest maintainer, ...) Thomas Huth
2024-10-21 16:11 ` [PULL v2 09/20] tests/functional: Convert the Avocado arm tuxrun tests Thomas Huth
2024-10-21 16:11 ` [PULL v2 12/20] tests/functional: Convert the Avocado i386 tuxrun test Thomas Huth
2024-10-21 16:11 ` [PULL v2 13/20] tests/functional: Convert the Avocado x86_64 " Thomas Huth
2024-10-21 16:11 ` [PULL v2 14/20] tests/functional: Convert the Avocado mips " Thomas Huth
2024-10-21 16:11 ` Thomas Huth [this message]
2024-10-21 16:11 ` [PULL v2 16/20] tests/functional: Convert the Avocado mips64 " Thomas Huth
2024-10-21 16:11 ` [PULL v2 17/20] tests/functional: Convert the Avocado mips64el " Thomas Huth
2024-10-21 16:11 ` [PULL v2 18/20] tests/functional: Convert the Avocado ppc32 " Thomas Huth
2024-10-21 16:11 ` [PULL v2 20/20] tests/functional: Convert the Avocado sh4 " Thomas Huth
2024-10-22 13:53 ` [PULL v2 00/20] Test updates (tuxrun tests, new QTest maintainer, ...) Peter Maydell
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=20241021161156.176427-6-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).