From ff94df87caeecf3fe2b77e06d2ffe483725bcb51 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 19 Aug 2025 13:23:52 +0200 Subject: tests/functional: Move or1k tests into target-specific folders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tests/functional folder has become quite crowded, thus move the openrisc tests into a target-specific subfolder. Reviewed-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth Message-ID: <20250819112403.432587-16-thuth@redhat.com> --- tests/functional/meson.build | 6 +----- tests/functional/or1k/meson.build | 6 ++++++ tests/functional/or1k/test_replay.py | 27 +++++++++++++++++++++++++++ tests/functional/or1k/test_sim.py | 26 ++++++++++++++++++++++++++ tests/functional/test_or1k_replay.py | 27 --------------------------- tests/functional/test_or1k_sim.py | 26 -------------------------- 6 files changed, 60 insertions(+), 58 deletions(-) create mode 100644 tests/functional/or1k/meson.build create mode 100755 tests/functional/or1k/test_replay.py create mode 100755 tests/functional/or1k/test_sim.py delete mode 100755 tests/functional/test_or1k_replay.py delete mode 100755 tests/functional/test_or1k_sim.py (limited to 'tests') diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 52969a3ff8..397303ec6f 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -23,6 +23,7 @@ subdir('mips') subdir('mipsel') subdir('mips64') subdir('mips64el') +subdir('or1k') test_ppc_timeouts = { 'ppc_40p' : 240, @@ -70,11 +71,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_or1k_system_thorough = [ - 'or1k_replay', - 'or1k_sim', -] - tests_ppc_system_quick = [ 'ppc_migration', 'ppc_74xx', diff --git a/tests/functional/or1k/meson.build b/tests/functional/or1k/meson.build new file mode 100644 index 0000000000..e246e2ab08 --- /dev/null +++ b/tests/functional/or1k/meson.build @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_or1k_system_thorough = [ + 'replay', + 'sim', +] diff --git a/tests/functional/or1k/test_replay.py b/tests/functional/or1k/test_replay.py new file mode 100755 index 0000000000..2b60a9372c --- /dev/null +++ b/tests/functional/or1k/test_replay.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python3 +# +# Replay test that boots a Linux kernel on an OpenRISC-1000 SIM machine +# and checks the console +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from replay_kernel import ReplayKernelBase + + +class Or1kReplay(ReplayKernelBase): + + ASSET_DAY20 = Asset( + 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day20.tar.xz', + 'ff9d7dd7c6bdba325bd85ee85c02db61ff653e129558aeffe6aff55bffb6763a') + + def test_sim(self): + self.set_machine('or1k-sim') + kernel_path = self.archive_extract(self.ASSET_DAY20, + member='day20/vmlinux') + self.run_rr(kernel_path, self.REPLAY_KERNEL_COMMAND_LINE, + 'QEMU advent calendar') + + +if __name__ == '__main__': + ReplayKernelBase.main() diff --git a/tests/functional/or1k/test_sim.py b/tests/functional/or1k/test_sim.py new file mode 100755 index 0000000000..f9f0b690a0 --- /dev/null +++ b/tests/functional/or1k/test_sim.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# Functional test that boots a Linux kernel on an OpenRISC-1000 SIM machine +# and checks the console +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import LinuxKernelTest, Asset + + +class OpenRISC1kSimTest(LinuxKernelTest): + + ASSET_DAY20 = Asset( + 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day20.tar.xz', + 'ff9d7dd7c6bdba325bd85ee85c02db61ff653e129558aeffe6aff55bffb6763a') + + def test_or1k_sim(self): + self.set_machine('or1k-sim') + self.archive_extract(self.ASSET_DAY20) + self.vm.set_console() + self.vm.add_args('-kernel', self.scratch_file('day20', 'vmlinux')) + self.vm.launch() + self.wait_for_console_pattern('QEMU advent calendar') + +if __name__ == '__main__': + LinuxKernelTest.main() diff --git a/tests/functional/test_or1k_replay.py b/tests/functional/test_or1k_replay.py deleted file mode 100755 index 2b60a9372c..0000000000 --- a/tests/functional/test_or1k_replay.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python3 -# -# Replay test that boots a Linux kernel on an OpenRISC-1000 SIM machine -# and checks the console -# -# SPDX-License-Identifier: GPL-2.0-or-later - -from qemu_test import Asset -from replay_kernel import ReplayKernelBase - - -class Or1kReplay(ReplayKernelBase): - - ASSET_DAY20 = Asset( - 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day20.tar.xz', - 'ff9d7dd7c6bdba325bd85ee85c02db61ff653e129558aeffe6aff55bffb6763a') - - def test_sim(self): - self.set_machine('or1k-sim') - kernel_path = self.archive_extract(self.ASSET_DAY20, - member='day20/vmlinux') - self.run_rr(kernel_path, self.REPLAY_KERNEL_COMMAND_LINE, - 'QEMU advent calendar') - - -if __name__ == '__main__': - ReplayKernelBase.main() diff --git a/tests/functional/test_or1k_sim.py b/tests/functional/test_or1k_sim.py deleted file mode 100755 index f9f0b690a0..0000000000 --- a/tests/functional/test_or1k_sim.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python3 -# -# Functional test that boots a Linux kernel on an OpenRISC-1000 SIM machine -# and checks the console -# -# SPDX-License-Identifier: GPL-2.0-or-later - -from qemu_test import LinuxKernelTest, Asset - - -class OpenRISC1kSimTest(LinuxKernelTest): - - ASSET_DAY20 = Asset( - 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day20.tar.xz', - 'ff9d7dd7c6bdba325bd85ee85c02db61ff653e129558aeffe6aff55bffb6763a') - - def test_or1k_sim(self): - self.set_machine('or1k-sim') - self.archive_extract(self.ASSET_DAY20) - self.vm.set_console() - self.vm.add_args('-kernel', self.scratch_file('day20', 'vmlinux')) - self.vm.launch() - self.wait_for_console_pattern('QEMU advent calendar') - -if __name__ == '__main__': - LinuxKernelTest.main() -- cgit 1.4.1