From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
avr tests into a target-specific subfolder.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
MAINTAINERS | 4 ++--
tests/functional/avr/meson.build | 6 ++++++
.../{test_avr_mega2560.py => avr/test_mega2560.py} | 0
tests/functional/{test_avr_uno.py => avr/test_uno.py} | 0
tests/functional/meson.build | 6 +-----
5 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 tests/functional/avr/meson.build
rename tests/functional/{test_avr_mega2560.py => avr/test_mega2560.py} (100%)
rename tests/functional/{test_avr_uno.py => avr/test_uno.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index fa7a0ee7e6e..0cfd12ec77e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -221,7 +221,7 @@ S: Maintained
F: docs/system/target-avr.rst
F: gdb-xml/avr-cpu.xml
F: target/avr/
-F: tests/functional/test_avr_*.py
+F: tests/functional/avr/
Hexagon TCG CPUs
M: Brian Cain <brian.cain@oss.qualcomm.com>
@@ -1247,7 +1247,7 @@ Arduino
M: Philippe Mathieu-Daudé <philmd@linaro.org>
S: Maintained
F: hw/avr/arduino.c
-F: tests/functional/test_avr_uno.py
+F: tests/functional/avr/test_uno.py
HP-PARISC Machines
------------------
diff --git a/tests/functional/avr/meson.build b/tests/functional/avr/meson.build
new file mode 100644
index 00000000000..7a2cb7099e7
--- /dev/null
+++ b/tests/functional/avr/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_avr_system_thorough = [
+ 'mega2560',
+ 'uno',
+]
diff --git a/tests/functional/test_avr_mega2560.py b/tests/functional/avr/test_mega2560.py
similarity index 100%
rename from tests/functional/test_avr_mega2560.py
rename to tests/functional/avr/test_mega2560.py
diff --git a/tests/functional/test_avr_uno.py b/tests/functional/avr/test_uno.py
similarity index 100%
rename from tests/functional/test_avr_uno.py
rename to tests/functional/avr/test_uno.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 708246b0d08..8b7b962d4d6 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -12,6 +12,7 @@ endif
subdir('aarch64')
subdir('alpha')
subdir('arm')
+subdir('avr')
test_mips_timeouts = {
'mips_malta' : 480,
@@ -77,11 +78,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_avr_system_thorough = [
- 'avr_mega2560',
- 'avr_uno',
-]
-
tests_hppa_system_quick = [
'hppa_seabios',
]
--
2.50.1