All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>
Cc: Guenter Roeck <linux@roeck-us.net>,
	Yoshinori Sato <ysato@users.sourceforge.jp>,
	Magnus Damm <magnus.damm@gmail.com>,
	qemu-arm@nongnu.org, Thomas Huth <thuth@redhat.com>
Subject: [PATCH 13/17] tests/functional: Convert the Avocado mips64 tuxrun test
Date: Fri, 11 Oct 2024 15:19:30 +0200	[thread overview]
Message-ID: <20241011131937.377223-14-thuth@redhat.com> (raw)
In-Reply-To: <20241011131937.377223-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>
---
 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.46.1

  parent reply	other threads:[~2024-10-11 13:20 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-11 13:19 [PATCH 00/17] Convert the Avocado tuxrun tests into new functional tests Thomas Huth
2024-10-11 13:19 ` [PATCH 01/17] tests/functional: Add a base class for the TuxRun tests Thomas Huth
2024-10-11 13:19 ` [PATCH 02/17] tests/functional: Convert the Avocado ppc64 tuxrun tests Thomas Huth
2024-10-11 13:19 ` [PATCH 03/17] tests/functional: Convert the Avocado aarch64 " Thomas Huth
2024-10-11 13:19 ` [PATCH 04/17] tests/functional: Convert the Avocado sparc64 tuxrun test Thomas Huth
2024-10-11 13:19 ` [PATCH 05/17] tests/functional: Convert the Avocado s390x " Thomas Huth
2024-10-11 13:19 ` [PATCH 06/17] tests/functional: Convert the Avocado arm tuxrun tests Thomas Huth
2024-10-11 13:19 ` [PATCH 07/17] tests/functional: Convert the Avocado riscv32 " Thomas Huth
2024-10-11 13:19 ` [PATCH 08/17] tests/functional: Convert the Avocado riscv64 " Thomas Huth
2024-10-11 13:19 ` [PATCH 09/17] tests/functional: Convert the Avocado i386 tuxrun test Thomas Huth
2024-10-11 13:19 ` [PATCH 10/17] tests/functional: Convert the Avocado x86_64 " Thomas Huth
2024-10-11 13:19 ` [PATCH 11/17] tests/functional: Convert the Avocado mips " Thomas Huth
2024-10-11 13:19 ` [PATCH 12/17] tests/functional: Convert the Avocado mipsel " Thomas Huth
2024-10-11 13:19 ` Thomas Huth [this message]
2024-10-11 13:19 ` [PATCH 14/17] tests/functional: Convert the Avocado mips64el " Thomas Huth
2024-10-11 13:19 ` [PATCH 15/17] tests/functional: Convert the Avocado ppc32 " Thomas Huth
2024-10-11 13:19 ` [PATCH 16/17] Revert "hw/sh4/r2d: Realize IDE controller before accessing it" Thomas Huth
2024-10-11 22:52   ` Philippe Mathieu-Daudé
2024-10-11 13:19 ` [PATCH 17/17] tests/functional: Convert the Avocado sh4 tuxrun test Thomas Huth
2024-10-13 15:27 ` [PATCH 00/17] Convert the Avocado tuxrun tests into new functional tests Alex Bennée
2024-10-14  6:12   ` Thomas Huth
2024-10-14 10:13     ` Daniel P. Berrangé
2024-10-21  6:01 ` 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=20241011131937.377223-14-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=linux@roeck-us.net \
    --cc=magnus.damm@gmail.com \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=ysato@users.sourceforge.jp \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.