[igt-dev] [PATCH i-g-t v3] meson: Move MSM-specific tests to their own subdirectory

[Abhinav Kumar]

This has been applied keeping petri's ack from the previous version.

Thanks

Abhinav

On 4/21/2022 10:28 AM, Jessica Zhang wrote:
> Move all custom MSM tests to their own subdirectory and have them
> installed in an msm/ subdirectory
> 
> Changes from v1:
> - Removed extra whitespace
> - Moved meson build commands for msm tests from tests/msm/meson.build
>    to tests/meson.build
> 
> Changes from v2:
> - Removed unused variables
> 
> Signed-off-by: Jessica Zhang <quic_jesszhan at quicinc.com>
> ---
>   tests/meson.build              | 18 +++++++++++++++---
>   tests/{ => msm}/msm_mapping.c  |  0
>   tests/{ => msm}/msm_recovery.c |  0
>   tests/{ => msm}/msm_submit.c   |  0
>   4 files changed, 15 insertions(+), 3 deletions(-)
>   rename tests/{ => msm}/msm_mapping.c (100%)
>   rename tests/{ => msm}/msm_recovery.c (100%)
>   rename tests/{ => msm}/msm_submit.c (100%)
> 
> diff --git a/tests/meson.build b/tests/meson.build
> index 7261e9aa2950..fb0f1e37f633 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -63,9 +63,6 @@ test_progs = [
>   	'kms_vrr',
>   	'kms_writeback',
>   	'meta_test',
> -	'msm_mapping',
> -	'msm_recovery',
> -	'msm_submit',
>   	'panfrost_get_param',
>   	'panfrost_gem_new',
>   	'panfrost_prime',
> @@ -253,6 +250,12 @@ i915_progs = [
>   	'sysfs_timeslice_duration',
>   ]
>   
> +msm_progs = [
> +	'msm_mapping',
> +	'msm_recovery',
> +	'msm_submit'
> +]
> +
>   test_deps = [ igt_deps ]
>   
>   if libdrm_nouveau.found()
> @@ -294,6 +297,15 @@ foreach prog : i915_progs
>   	test_list += prog
>   endforeach
>   
> +foreach prog : msm_progs
> +	test_executables += executable(prog, join_paths('msm', prog + '.c'),
> +				       dependencies : test_deps,
> +				       install_dir : libexecdir,
> +				       install_rpath : libexecdir_rpathdir,
> +				       install : true)
> +	test_list += prog
> +endforeach
> +
>   test_executables += executable('drm_fdinfo',
>   	   join_paths('i915', 'drm_fdinfo.c'),
>   	   dependencies : test_deps + [ lib_igt_drm_fdinfo ],
> diff --git a/tests/msm_mapping.c b/tests/msm/msm_mapping.c
> similarity index 100%
> rename from tests/msm_mapping.c
> rename to tests/msm/msm_mapping.c
> diff --git a/tests/msm_recovery.c b/tests/msm/msm_recovery.c
> similarity index 100%
> rename from tests/msm_recovery.c
> rename to tests/msm/msm_recovery.c
> diff --git a/tests/msm_submit.c b/tests/msm/msm_submit.c
> similarity index 100%
> rename from tests/msm_submit.c
> rename to tests/msm/msm_submit.c