From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	"Daniel P . Berrange" <berrange@redhat.com>
Subject: [PATCH 03/14] tests/functional: Convert mips64el Fuloong2e avocado test (2/2)
Date: Fri,  6 Sep 2024 20:05:38 +0200	[thread overview]
Message-ID: <20240906180549.792832-4-thuth@redhat.com> (raw)
In-Reply-To: <20240906180549.792832-1-thuth@redhat.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Straight forward conversion. Update the SHA1 hashes to
SHA256 hashes since SHA1 should not be used anymore nowadays.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
[thuth: Use LinuxKernelTest class for this test]
Message-ID: <20240827094905.80648-3-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/avocado/boot_linux_console.py         | 21 -----------------
 tests/functional/test_mips64el_fuloong2e.py | 25 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 396836bf64..e1e20c36f7 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -170,27 +170,6 @@ def test_mips64el_malta(self):
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         self.wait_for_console_pattern(console_pattern)
 
-    def test_mips64el_fuloong2e(self):
-        """
-        :avocado: tags=arch:mips64el
-        :avocado: tags=machine:fuloong2e
-        :avocado: tags=endian:little
-        """
-        deb_url = ('http://archive.debian.org/debian/pool/main/l/linux/'
-                   'linux-image-3.16.0-6-loongson-2e_3.16.56-1+deb8u1_mipsel.deb')
-        deb_hash = 'd04d446045deecf7b755ef576551de0c4184dd44'
-        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
-        kernel_path = self.extract_from_deb(deb_path,
-                                            '/boot/vmlinux-3.16.0-6-loongson-2e')
-
-        self.vm.set_console()
-        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0'
-        self.vm.add_args('-kernel', kernel_path,
-                         '-append', kernel_command_line)
-        self.vm.launch()
-        console_pattern = 'Kernel command line: %s' % kernel_command_line
-        self.wait_for_console_pattern(console_pattern)
-
     def test_mips_malta_cpio(self):
         """
         :avocado: tags=arch:mips
diff --git a/tests/functional/test_mips64el_fuloong2e.py b/tests/functional/test_mips64el_fuloong2e.py
index 7688a32713..a32d5f9d08 100755
--- a/tests/functional/test_mips64el_fuloong2e.py
+++ b/tests/functional/test_mips64el_fuloong2e.py
@@ -12,14 +12,33 @@
 import os
 import subprocess
 
-from qemu_test import QemuSystemTest
+from qemu_test import LinuxKernelTest, Asset
 from qemu_test import wait_for_console_pattern
 from unittest import skipUnless
 
-class MipsFuloong2e(QemuSystemTest):
+class MipsFuloong2e(LinuxKernelTest):
 
     timeout = 60
 
+    ASSET_KERNEL = Asset(
+        ('http://archive.debian.org/debian/pool/main/l/linux/'
+         'linux-image-3.16.0-6-loongson-2e_3.16.56-1+deb8u1_mipsel.deb'),
+        '2a70f15b397f4ced632b0c15cb22660394190644146d804d60a4796eefbe1f50')
+
+    def test_linux_kernel_3_16(self):
+        deb_path = self.ASSET_KERNEL.fetch()
+        kernel_path = self.extract_from_deb(deb_path,
+                                            '/boot/vmlinux-3.16.0-6-loongson-2e')
+
+        self.set_machine('fuloong2e')
+        self.vm.set_console()
+        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0'
+        self.vm.add_args('-kernel', kernel_path,
+                         '-append', kernel_command_line)
+        self.vm.launch()
+        console_pattern = 'Kernel command line: %s' % kernel_command_line
+        self.wait_for_console_pattern(console_pattern)
+
     @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
     @skipUnless(os.getenv('RESCUE_YL_PATH'), 'RESCUE_YL_PATH not available')
     def test_linux_kernel_2_6_27_isa_serial(self):
@@ -42,4 +61,4 @@ def test_linux_kernel_2_6_27_isa_serial(self):
 
 
 if __name__ == '__main__':
-    QemuSystemTest.main()
+    LinuxKernelTest.main()
-- 
2.46.0
next prev parent reply	other threads:[~2024-09-06 18:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-06 18:05 [PATCH 00/14] Convert Avocado tests based on LinuxKernelTest class Thomas Huth
2024-09-06 18:05 ` [PATCH 01/14] tests/functional: Add the LinuxKernelTest for testing the Linux boot process Thomas Huth
2024-09-07  4:43   ` Philippe Mathieu-Daudé
2024-09-06 18:05 ` [PATCH 02/14] tests/functional: Convert the m68k Q800 Avocado test into a functional test Thomas Huth
2024-09-07  4:36   ` Philippe Mathieu-Daudé
2024-09-06 18:05 ` Thomas Huth [this message]
2024-09-06 18:05 ` [PATCH 04/14] tests/functional: Convert mips64el I6400 Malta avocado tests Thomas Huth
2024-09-06 18:05 ` [PATCH 05/14] tests/functional: Convert mips64el 5KEc " Thomas Huth
2024-09-06 18:05 ` [PATCH 06/14] tests/functional: Convert mips32el Malta YAMON avocado test Thomas Huth
2024-09-06 18:05 ` [PATCH 07/14] tests/functional: Convert nanomips Malta avocado tests Thomas Huth
2024-09-06 18:05 ` [PATCH 08/14] tests/functional: Convert mips32eb 4Kc " Thomas Huth
2024-09-06 18:05 ` [PATCH 09/14] tests/functional: Convert ARM Raspi2 " Thomas Huth
2024-09-06 18:05 ` [PATCH 10/14] tests/functional: Convert Aarch64 Raspi3 " Thomas Huth
2024-09-06 18:05 ` [PATCH 11/14] tests/functional: Convert Aarch64 Raspi4 " Thomas Huth
2024-09-06 18:05 ` [PATCH 12/14] tests/functional: Convert the Alpha Clipper Avocado test Thomas Huth
2024-09-07  4:30   ` Philippe Mathieu-Daudé
2024-09-06 18:05 ` [PATCH 13/14] tests/functional: Convert the m68k MCF5208EVB " Thomas Huth
2024-09-07  4:32   ` Philippe Mathieu-Daudé
2024-09-06 18:05 ` [PATCH 14/14] tests/functional: Convert the or1k-sim " Thomas Huth
2024-09-07  4:37   ` Philippe Mathieu-Daudé
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=20240906180549.792832-4-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=berrange@redhat.com \
    --cc=philmd@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).