Re: [PATCH 20/24] tests/functional: Move sh4/sh4eb tests into target-specific folders

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

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
> sh4 tests into a target-specific subfolder.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   MAINTAINERS                                       |  4 ++--
>   tests/functional/meson.build                      | 15 ++-------------
>   tests/functional/sh4/meson.build                  | 10 ++++++++++
>   .../{test_sh4_r2d.py => sh4/test_r2d.py}          |  0
>   .../{test_sh4_tuxrun.py => sh4/test_tuxrun.py}    |  0
>   tests/functional/sh4eb/meson.build                |  5 +++++
>   .../{test_sh4eb_r2d.py => sh4eb/test_r2d.py}      |  0
>   7 files changed, 19 insertions(+), 15 deletions(-)
>   create mode 100644 tests/functional/sh4/meson.build
>   rename tests/functional/{test_sh4_r2d.py => sh4/test_r2d.py} (100%)
>   rename tests/functional/{test_sh4_tuxrun.py => sh4/test_tuxrun.py} (100%)
>   create mode 100644 tests/functional/sh4eb/meson.build
>   rename tests/functional/{test_sh4eb_r2d.py => sh4eb/test_r2d.py} (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 1f6b85ee132..a0174fca572 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1732,8 +1732,8 @@ F: hw/pci-host/sh_pci.c
>   F: hw/timer/sh_timer.c
>   F: include/hw/sh4/sh_intc.h
>   F: include/hw/timer/tmu012.h
> -F: tests/functional/test_sh4*_r2d.py
> -F: tests/functional/test_sh4_tuxrun.py
> +F: tests/functional/sh4*/test_r2d.py
> +F: tests/functional/sh4/test_tuxrun.py
>   
>   SPARC Machines
>   --------------
> diff --git a/tests/functional/meson.build b/tests/functional/meson.build
> index abaa4e00fca..ce713509e32 100644
> --- a/tests/functional/meson.build
> +++ b/tests/functional/meson.build
> @@ -30,10 +30,8 @@ subdir('riscv32')
>   subdir('riscv64')
>   subdir('rx')
>   subdir('s390x')
> -
> -test_sh4_timeouts = {
> -  'sh4_tuxrun' : 240,
> -}
> +subdir('sh4')
> +subdir('sh4eb')

Here also I'd keep a single sh4/ directory (it is the same architecture
with an endianness variant we're going to remove).

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