[PATCH 11/24] tests/functional: Move loongarch64 tests into architecture specific folder

Thomas Huth posted 24 patches 3 months, 2 weeks ago
There is a newer version of this series
[PATCH 11/24] tests/functional: Move loongarch64 tests into architecture specific folder
Posted by Thomas Huth 3 months, 2 weeks ago
From: Thomas Huth <thuth@redhat.com>

The tests/functional folder has become quite crowded, thus move the
loongarch64 tests into a target-specific subfolder.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 MAINTAINERS                                                  | 2 +-
 tests/functional/loongarch64/meson.build                     | 5 +++++
 .../{test_loongarch64_virt.py => loongarch64/test_virt.py}   | 0
 tests/functional/meson.build                                 | 5 +----
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 tests/functional/loongarch64/meson.build
 rename tests/functional/{test_loongarch64_virt.py => loongarch64/test_virt.py} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index db89dd830b4..2065e73e155 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -257,7 +257,7 @@ M: Song Gao <gaosong@loongson.cn>
 S: Maintained
 F: target/loongarch/
 F: tests/tcg/loongarch64/
-F: tests/functional/test_loongarch64_virt.py
+F: tests/functional/loongarch64/test_virt.py
 
 M68K TCG CPUs
 M: Laurent Vivier <laurent@vivier.eu>
diff --git a/tests/functional/loongarch64/meson.build b/tests/functional/loongarch64/meson.build
new file mode 100644
index 00000000000..d1687176a3d
--- /dev/null
+++ b/tests/functional/loongarch64/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_loongarch64_system_thorough = [
+  'virt',
+]
diff --git a/tests/functional/test_loongarch64_virt.py b/tests/functional/loongarch64/test_virt.py
similarity index 100%
rename from tests/functional/test_loongarch64_virt.py
rename to tests/functional/loongarch64/test_virt.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index c72b17df1dd..22b46ab34a2 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -15,6 +15,7 @@ subdir('arm')
 subdir('avr')
 subdir('hppa')
 subdir('i386')
+subdir('loongarch64')
 
 test_mips_timeouts = {
   'mips_malta' : 480,
@@ -80,10 +81,6 @@ tests_generic_linuxuser = [
 tests_generic_bsduser = [
 ]
 
-tests_loongarch64_system_thorough = [
-  'loongarch64_virt',
-]
-
 tests_m68k_system_thorough = [
   'm68k_mcf5208evb',
   'm68k_nextcube',
-- 
2.50.1
Re: [PATCH 11/24] tests/functional: Move loongarch64 tests into architecture specific folder
Posted by Philippe Mathieu-Daudé 3 months, 1 week ago
On 1/8/25 17:12, Thomas Huth wrote:
> From: Thomas Huth <thuth@redhat.com>
> 
> The tests/functional folder has become quite crowded, thus move the
> loongarch64 tests into a target-specific subfolder.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   MAINTAINERS                                                  | 2 +-
>   tests/functional/loongarch64/meson.build                     | 5 +++++
>   .../{test_loongarch64_virt.py => loongarch64/test_virt.py}   | 0
>   tests/functional/meson.build                                 | 5 +----
>   4 files changed, 7 insertions(+), 5 deletions(-)
>   create mode 100644 tests/functional/loongarch64/meson.build
>   rename tests/functional/{test_loongarch64_virt.py => loongarch64/test_virt.py} (100%)


> diff --git a/tests/functional/test_loongarch64_virt.py b/tests/functional/loongarch64/test_virt.py
> similarity index 100%
> rename from tests/functional/test_loongarch64_virt.py
> rename to tests/functional/loongarch64/test_virt.py
> diff --git a/tests/functional/meson.build b/tests/functional/meson.build
> index c72b17df1dd..22b46ab34a2 100644
> --- a/tests/functional/meson.build
> +++ b/tests/functional/meson.build
> @@ -15,6 +15,7 @@ subdir('arm')
>   subdir('avr')
>   subdir('hppa')
>   subdir('i386')
> +subdir('loongarch64')

I'd just go with generic 'loongarch'. Regardless:

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>