aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2025-08-19 13:23:57 +0200
committerThomas Huth <thuth@redhat.com>2025-08-27 09:46:55 +0200
commit58e95a05dec8bb0c739a2b7192b6d0a96d1a99a5 (patch)
tree83e8bccbbcb2509b36ba93d88829f0ae47a9871e
parent5e50a3c9c0f31daf53962914855accdc97a3109b (diff)
downloadqemu-58e95a05dec8bb0c739a2b7192b6d0a96d1a99a5.zip
qemu-58e95a05dec8bb0c739a2b7192b6d0a96d1a99a5.tar.gz
qemu-58e95a05dec8bb0c739a2b7192b6d0a96d1a99a5.tar.bz2
tests/functional: Move sh4/sh4eb tests into target-specific folders
The tests/functional folder has become quite crowded, thus move the sh4 tests into a target-specific subfolder. Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Thomas Huth <thuth@redhat.com> Message-ID: <20250819112403.432587-21-thuth@redhat.com>
-rw-r--r--MAINTAINERS4
-rw-r--r--tests/functional/meson.build15
-rw-r--r--tests/functional/sh4/meson.build10
-rwxr-xr-xtests/functional/sh4/test_r2d.py (renamed from tests/functional/test_sh4_r2d.py)0
-rwxr-xr-xtests/functional/sh4/test_tuxrun.py (renamed from tests/functional/test_sh4_tuxrun.py)0
-rw-r--r--tests/functional/sh4eb/meson.build5
-rwxr-xr-xtests/functional/sh4eb/test_r2d.py (renamed from tests/functional/test_sh4eb_r2d.py)0
7 files changed, 19 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4a55a20..eddec00 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1736,8 +1736,8 @@ F: hw/pci-host/sh_pci.c
F: hw/timer/sh_timer.c
F: include/hw/sh4/sh_intc.h
F: include/hw/timer/tmu012.h
-F: tests/functional/test_sh4*_r2d.py
-F: tests/functional/test_sh4_tuxrun.py
+F: tests/functional/sh4*/test_r2d.py
+F: tests/functional/sh4/test_tuxrun.py
SPARC Machines
--------------
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index abaa4e0..ce71350 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -30,10 +30,8 @@ subdir('riscv32')
subdir('riscv64')
subdir('rx')
subdir('s390x')
-
-test_sh4_timeouts = {
- 'sh4_tuxrun' : 240,
-}
+subdir('sh4')
+subdir('sh4eb')
test_x86_64_timeouts = {
'acpi_bits' : 420,
@@ -56,15 +54,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_sh4_system_thorough = [
- 'sh4_r2d',
- 'sh4_tuxrun',
-]
-
-tests_sh4eb_system_thorough = [
- 'sh4eb_r2d',
-]
-
tests_sparc_system_quick = [
'sparc_migration',
]
diff --git a/tests/functional/sh4/meson.build b/tests/functional/sh4/meson.build
new file mode 100644
index 0000000..56f824e
--- /dev/null
+++ b/tests/functional/sh4/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_sh4_timeouts = {
+ 'tuxrun' : 240,
+}
+
+tests_sh4_system_thorough = [
+ 'r2d',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_sh4_r2d.py b/tests/functional/sh4/test_r2d.py
index 03a64837..03a64837 100755
--- a/tests/functional/test_sh4_r2d.py
+++ b/tests/functional/sh4/test_r2d.py
diff --git a/tests/functional/test_sh4_tuxrun.py b/tests/functional/sh4/test_tuxrun.py
index 1748f8c..1748f8c 100755
--- a/tests/functional/test_sh4_tuxrun.py
+++ b/tests/functional/sh4/test_tuxrun.py
diff --git a/tests/functional/sh4eb/meson.build b/tests/functional/sh4eb/meson.build
new file mode 100644
index 0000000..25e9a6e
--- /dev/null
+++ b/tests/functional/sh4eb/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_sh4eb_system_thorough = [
+ 'r2d',
+]
diff --git a/tests/functional/test_sh4eb_r2d.py b/tests/functional/sh4eb/test_r2d.py
index 473093b..473093b 100755
--- a/tests/functional/test_sh4eb_r2d.py
+++ b/tests/functional/sh4eb/test_r2d.py