From: Thomas Huth <th...@redhat.com>
The tests/functional folder has become quite crowded, thus move the
m68k tests into a target-specific subfolder.
Signed-off-by: Thomas Huth <th...@redhat.com>
---
MAINTAINERS | 8 ++++----
tests/functional/m68k/meson.build | 9 +++++++++
.../{test_m68k_mcf5208evb.py => m68k/test_mcf5208evb.py} | 0
.../{test_m68k_nextcube.py => m68k/test_nextcube.py} | 0
.../functional/{test_m68k_q800.py => m68k/test_q800.py} | 0
.../{test_m68k_replay.py => m68k/test_replay.py} | 0
.../{test_m68k_tuxrun.py => m68k/test_tuxrun.py} | 0
tests/functional/meson.build | 9 +--------
8 files changed, 14 insertions(+), 12 deletions(-)
create mode 100644 tests/functional/m68k/meson.build
rename tests/functional/{test_m68k_mcf5208evb.py => m68k/test_mcf5208evb.py}
(100%)
rename tests/functional/{test_m68k_nextcube.py => m68k/test_nextcube.py} (100%)
rename tests/functional/{test_m68k_q800.py => m68k/test_q800.py} (100%)
rename tests/functional/{test_m68k_replay.py => m68k/test_replay.py} (100%)
rename tests/functional/{test_m68k_tuxrun.py => m68k/test_tuxrun.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2065e73e155..5860922277e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1309,7 +1309,7 @@ F: hw/m68k/mcf_intc.c
F: hw/char/mcf_uart.c
F: hw/net/mcf_fec.c
F: include/hw/m68k/mcf*.h
-F: tests/functional/test_m68k_mcf5208evb.py
+F: tests/functional/m68k/test_mcf5208evb.py
NeXTcube
M: Thomas Huth <h...@tuxfamily.org>
@@ -1317,7 +1317,7 @@ S: Odd Fixes
F: hw/m68k/next-*.c
F: hw/display/next-fb.c
F: include/hw/m68k/next-cube.h
-F: tests/functional/test_m68k_nextcube.py
+F: tests/functional/m68k/test_nextcube.py
q800
M: Laurent Vivier <laur...@vivier.eu>
@@ -1343,7 +1343,7 @@ F: include/hw/m68k/q800-glue.h
F: include/hw/misc/djmemc.h
F: include/hw/misc/iosb.h
F: include/hw/audio/asc.h
-F: tests/functional/test_m68k_q800.py
+F: tests/functional/m68k/test_q800.py
virt
M: Laurent Vivier <laur...@vivier.eu>
@@ -1358,7 +1358,7 @@ F: include/hw/intc/goldfish_pic.h
F: include/hw/intc/m68k_irqc.h
F: include/hw/misc/virt_ctrl.h
F: docs/specs/virt-ctlr.rst
-F: tests/functional/test_m68k_tuxrun.py
+F: tests/functional/m68k/test_tuxrun.py
MicroBlaze Machines
-------------------
diff --git a/tests/functional/m68k/meson.build
b/tests/functional/m68k/meson.build
new file mode 100644
index 00000000000..e29044a6d73
--- /dev/null
+++ b/tests/functional/m68k/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_m68k_system_thorough = [
+ 'mcf5208evb',
+ 'nextcube',
+ 'replay',
+ 'q800',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_m68k_mcf5208evb.py
b/tests/functional/m68k/test_mcf5208evb.py
similarity index 100%
rename from tests/functional/test_m68k_mcf5208evb.py
rename to tests/functional/m68k/test_mcf5208evb.py
diff --git a/tests/functional/test_m68k_nextcube.py
b/tests/functional/m68k/test_nextcube.py
similarity index 100%
rename from tests/functional/test_m68k_nextcube.py
rename to tests/functional/m68k/test_nextcube.py
diff --git a/tests/functional/test_m68k_q800.py
b/tests/functional/m68k/test_q800.py
similarity index 100%
rename from tests/functional/test_m68k_q800.py
rename to tests/functional/m68k/test_q800.py
diff --git a/tests/functional/test_m68k_replay.py
b/tests/functional/m68k/test_replay.py
similarity index 100%
rename from tests/functional/test_m68k_replay.py
rename to tests/functional/m68k/test_replay.py
diff --git a/tests/functional/test_m68k_tuxrun.py
b/tests/functional/m68k/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_m68k_tuxrun.py
rename to tests/functional/m68k/test_tuxrun.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 22b46ab34a2..cc81d40a314 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -16,6 +16,7 @@ subdir('avr')
subdir('hppa')
subdir('i386')
subdir('loongarch64')
+subdir('m68k')
test_mips_timeouts = {
'mips_malta' : 480,
@@ -81,14 +82,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_m68k_system_thorough = [
- 'm68k_mcf5208evb',
- 'm68k_nextcube',
- 'm68k_replay',
- 'm68k_q800',
- 'm68k_tuxrun',
-]
-
tests_microblaze_system_thorough = [
'microblaze_replay',
'microblaze_s3adsp1800'
--
2.50.1
