From: Thomas Huth <th...@redhat.com>
The tests/functional folder has become quite crowded, thus move the
openrisc tests into a target-specific subfolder.
Signed-off-by: Thomas Huth <th...@redhat.com>
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 6 +-----
tests/functional/or1k/meson.build | 6 ++++++
.../functional/{test_or1k_replay.py => or1k/test_replay.py} | 0
tests/functional/{test_or1k_sim.py => or1k/test_sim.py} | 0
5 files changed, 8 insertions(+), 6 deletions(-)
create mode 100644 tests/functional/or1k/meson.build
rename tests/functional/{test_or1k_replay.py => or1k/test_replay.py} (100%)
rename tests/functional/{test_or1k_sim.py => or1k/test_sim.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 56e430db153..db0cc7de6cb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1454,7 +1454,7 @@ S: Maintained
F: docs/system/openrisc/or1k-sim.rst
F: hw/intc/ompic.c
F: hw/openrisc/openrisc_sim.c
-F: tests/functional/test_or1k_sim.py
+F: tests/functional/or1k/test_sim.py
PowerPC Machines
----------------
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 586f3dc6cac..e5e3d1667b8 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 00000000000..e246e2ab08d
--- /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/test_or1k_replay.py
b/tests/functional/or1k/test_replay.py
similarity index 100%
rename from tests/functional/test_or1k_replay.py
rename to tests/functional/or1k/test_replay.py
diff --git a/tests/functional/test_or1k_sim.py
b/tests/functional/or1k/test_sim.py
similarity index 100%
rename from tests/functional/test_or1k_sim.py
rename to tests/functional/or1k/test_sim.py
--
2.50.1
