[PATCH i-g-t v1] tests/meson.build: Generate test-list for cross build

Kamil Konieczny kamil.konieczny at linux.intel.com
Mon May 6 12:56:03 UTC 2024


Hi Vignesh,
On 2024-05-02 at 12:13:09 +0530, Vignesh Raman wrote:
> test-list.txt and test-list-full.txt are not generated for
> cross-builds, and they are required by drm-ci for testing.
> Commit 485bcb98 disables generating .testlist files for
> cross-builds since the binaries cannot be executed, but
> test-list.txt and test-list-full.txt generation shouldn't
> require that. So generate them for cross-builds.
> 
> Signed-off-by: Vignesh Raman <vignesh.raman at collabora.com>


It looks like we need a better documentation for this
and also what is a use case we want to solve, see:

build/tests$ wc *txt
    3   389  6134 test-list-full.txt
    3   388  6115 test-list.txt
    6   777 12249 total

looks like there is a little (one test?) diff between both.

+cc Petri

Patch itself is ok, so
Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>

Regards,
Kamil

> ---
>  tests/meson.build | 26 ++++++++++----------------
>  1 file changed, 10 insertions(+), 16 deletions(-)
> 
> diff --git a/tests/meson.build b/tests/meson.build
> index 65b8bf23b..758ae090c 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -468,15 +468,11 @@ subdir('vc4')
>  subdir('vmwgfx')
>  
>  gen_testlist = find_program('generate_testlist.sh')
> -if not meson.is_cross_build()
> -	test_list_target = custom_target('testlist',
> -		    output : 'test-list.txt',
> -		    command : [ gen_testlist, '@OUTPUT@', test_list ],
> -		    install : true,
> -		    install_dir : libexecdir)
> -else
> -	test_list_target = []
> -endif
> +test_list_target = custom_target('testlist',
> +	      output : 'test-list.txt',
> +	      command : [ gen_testlist, '@OUTPUT@', test_list ],
> +	      install : true,
> +	      install_dir : libexecdir)
>  
>  test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c',
>  	   dependencies : test_deps + [ libatomic ],
> @@ -485,13 +481,11 @@ test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c
>  	   install : true)
>  test_list += 'gem_concurrent_all'
>  
> -if not meson.is_cross_build()
> -	test_list_full_target = custom_target('testlist-full',
> -		    output : 'test-list-full.txt',
> -		    command : [ gen_testlist, '@OUTPUT@', test_list ],
> -		    install : true,
> -		    install_dir : libexecdir)
> -endif
> +test_list_full_target = custom_target('testlist-full',
> +	      output : 'test-list-full.txt',
> +	      command : [ gen_testlist, '@OUTPUT@', test_list ],
> +	      install : true,
> +	      install_dir : libexecdir)
>  
>  test_script = find_program('igt_command_line.sh')
>  foreach prog : test_list
> -- 
> 2.40.1
> 


More information about the igt-dev mailing list