[13/14] tests/functional: Convert the m68k MCF5208EVB Avocado test

Commit Message

Thomas Huth Sept. 6, 2024, 6:05 p.m. UTC

We've got to do_test_advcal_2018() here now that the test resides
in a separate file. Also switch back to the original URL (since
the site did not vanish as originally expected) and update the
hashsum to use SHA256.

Signed-off-by: Thomas Huth <[e-mail]>
---
 tests/avocado/boot_linux_console.py      |  8 -------
 tests/functional/meson.build             |  1 +
 tests/functional/test_m68k_mcf5208evb.py | 29 ++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100755 tests/functional/test_m68k_mcf5208evb.py

Comments

Philippe Mathieu-Daudé Sept. 7, 2024, 4:32 a.m. UTC | #1

On 6/9/24 20:05, Thomas Huth wrote:
> We've got to do_test_advcal_2018() here now that the test resides
> in a separate file. Also switch back to the original URL (since
> the site did not vanish as originally expected) and update the
> hashsum to use SHA256.
> 
> Signed-off-by: Thomas Huth <[e-mail]>
> ---
>   tests/avocado/boot_linux_console.py      |  8 -------
>   tests/functional/meson.build             |  1 +
>   tests/functional/test_m68k_mcf5208evb.py | 29 ++++++++++++++++++++++++
>   3 files changed, 30 insertions(+), 8 deletions(-)
>   create mode 100755 tests/functional/test_m68k_mcf5208evb.py

Tested-by: Philippe Mathieu-Daudé <[e-mail]>
Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>

Patch

diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 75aab90320..db72bd1b5e 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -927,14 +927,6 @@  def test_arm_ast2600_debian(self):
         self.wait_for_console_pattern("SMP: Total of 2 processors activated")
         self.wait_for_console_pattern("No filesystem could mount root")
 
-    def test_m68k_mcf5208evb(self):
-        """
-        :avocado: tags=arch:m68k
-        :avocado: tags=machine:mcf5208evb
-        """
-        tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c'
-        self.do_test_advcal_2018('07', tar_hash, 'sanity-clause.elf')
-
     def test_or1k_sim(self):
         """
         :avocado: tags=arch:or1k
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index e1903132a1..8f9694244f 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -64,6 +64,7 @@  tests_loongarch64_system_thorough = [
 ]
 
 tests_m68k_system_thorough = [
+  'm68k_mcf5208evb',
   'm68k_nextcube',
   'm68k_q800',
 ]
diff --git a/tests/functional/test_m68k_mcf5208evb.py b/tests/functional/test_m68k_mcf5208evb.py
new file mode 100755
index 0000000000..869ccc88df
--- /dev/null
+++ b/tests/functional/test_m68k_mcf5208evb.py
@@ -0,0 +1,29 @@ 
+#!/usr/bin/env python3
+#
+# Functional test that boots a Linux kernel on an MCF5208EVB machine
+# and checks the console
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+import os
+
+from qemu_test import LinuxKernelTest, Asset
+from qemu_test.utils import archive_extract
+
+class Mcf5208EvbTest(LinuxKernelTest):
+
+    ASSET_DAY07 = Asset(
+        'https://www.qemu-advent-calendar.org/2018/download/day07.tar.xz',
+        '753c2f3837126b7c6ba92d0b1e0b156e8a2c5131d2d576bb0b9a763fae73c08a')
+
+    def test_m68k_mcf5208evb(self):
+        self.set_machine('mcf5208evb')
+        file_path = self.ASSET_DAY07.fetch()
+        archive_extract(file_path, self.workdir)
+        self.vm.set_console()
+        self.vm.add_args('-kernel', self.workdir + '/day07/sanity-clause.elf')
+        self.vm.launch()
+        self.wait_for_console_pattern('QEMU advent calendar')
+
+if __name__ == '__main__':
+    LinuxKernelTest.main()