From: Thomas Huth <th...@redhat.com>
The tests/functional folder has become quite crowded, thus move the
xtensa tests into a target-specific subfolder.
Signed-off-by: Thomas Huth <th...@redhat.com>
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 6 +-----
tests/functional/xtensa/meson.build | 6 ++++++
.../functional/{test_xtensa_lx60.py => xtensa/test_lx60.py} | 0
.../{test_xtensa_replay.py => xtensa/test_replay.py} | 0
5 files changed, 8 insertions(+), 6 deletions(-)
create mode 100644 tests/functional/xtensa/meson.build
rename tests/functional/{test_xtensa_lx60.py => xtensa/test_lx60.py} (100%)
rename tests/functional/{test_xtensa_replay.py => xtensa/test_replay.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 20538ba9fe7..821a7a07ed6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2000,7 +2000,7 @@ S: Maintained
F: hw/xtensa/xtfpga.c
F: hw/net/opencores_eth.c
F: include/hw/xtensa/mx_pic.h
-F: tests/functional/test_xtensa_lx60.py
+F: tests/functional/xtensa/test_lx60.py
Devices
-------
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 34e30239a6b..b1eec16add8 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -35,6 +35,7 @@ subdir('sh4eb')
subdir('sparc')
subdir('sparc64')
subdir('x86_64')
+subdir('xtensa')
tests_generic_system = [
'empty_cpu_model',
@@ -48,11 +49,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_xtensa_system_thorough = [
- 'xtensa_lx60',
- 'xtensa_replay',
-]
-
precache_all = []
foreach speed : ['quick', 'thorough']
foreach dir : target_dirs
diff --git a/tests/functional/xtensa/meson.build
b/tests/functional/xtensa/meson.build
new file mode 100644
index 00000000000..d61d82a1356
--- /dev/null
+++ b/tests/functional/xtensa/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_xtensa_system_thorough = [
+ 'lx60',
+ 'replay',
+]
diff --git a/tests/functional/test_xtensa_lx60.py
b/tests/functional/xtensa/test_lx60.py
similarity index 100%
rename from tests/functional/test_xtensa_lx60.py
rename to tests/functional/xtensa/test_lx60.py
diff --git a/tests/functional/test_xtensa_replay.py
b/tests/functional/xtensa/test_replay.py
similarity index 100%
rename from tests/functional/test_xtensa_replay.py
rename to tests/functional/xtensa/test_replay.py
--
2.50.1
