[PATCH i-g-t v3 1/5] data: Move PNG images to new data directory

[Kamil Konieczny]

Hi Naladala,
On 2025-02-19 at 03:23:45 +0530, Naladala Ramanaidu wrote:
> Placing png images inside "tests/" directory seems wrong, as these
> are not source files. These images should ideally be in a directory
> with other non-exec files, so creating a new "data/" directory to
> store such non-exec files.
> 
> v2: Update commit message subject (Kamil)
> 
> Signed-off-by: Naladala Ramanaidu <ramanaidu.naladala at intel.com>
> Signed-off-by: Swati Sharma <swati2.sharma at intel.com>
> ---
>  {tests => data}/1080p-left.png  | Bin
>  {tests => data}/1080p-right.png | Bin
>  data/meson.build                |  11 +++++++++++
>  {tests => data}/pass.png        | Bin
>  lib/meson.build                 |   1 +
>  meson.build                     |   2 ++
>  tests/meson.build               |   7 -------
>  7 files changed, 14 insertions(+), 7 deletions(-)
>  rename {tests => data}/1080p-left.png (100%)
>  rename {tests => data}/1080p-right.png (100%)
>  create mode 100644 data/meson.build
>  rename {tests => data}/pass.png (100%)
> 
> diff --git a/tests/1080p-left.png b/data/1080p-left.png
> similarity index 100%
> rename from tests/1080p-left.png
> rename to data/1080p-left.png
> diff --git a/tests/1080p-right.png b/data/1080p-right.png
> similarity index 100%
> rename from tests/1080p-right.png
> rename to data/1080p-right.png
> diff --git a/data/meson.build b/data/meson.build
> new file mode 100644
> index 000000000..9490d20ac
> --- /dev/null
> +++ b/data/meson.build
> @@ -0,0 +1,11 @@
> +image_files = [
> +  '1080p-left.png',
> +  '1080p-right.png',
> +  'pass.png',
> +]
> +
> +foreach img : image_files
> +      configure_file(output:img, input:img, copy:true)
> +endforeach
> +
> +install_data(sources : image_files, install_dir : datadir)

Are you sure this is ok? I tested it and PNG files where placed
in /usr/local/share/igt-gpu-tools/

while I would expect them in
/usr/local/share/igt-gpu-tools/data/

Please look for 'registers' folder used in intel_reg tools,
it is installed as /usr/local/share/igt-gpu-tools/registers/
and has there its files.

Regards,
Kamil

> diff --git a/tests/pass.png b/data/pass.png
> similarity index 100%
> rename from tests/pass.png
> rename to data/pass.png
> diff --git a/lib/meson.build b/lib/meson.build
> index 9fffdd3c6..a248eb629 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -240,6 +240,7 @@ foreach f: lib_sources
>  	    '-DIGT_DATADIR="@0@"'.format(join_paths(prefix, datadir)),
>  	    '-DIGT_SRCDIR="@0@"'.format(srcdir),
>  	    '-DIGT_LOG_DOMAIN="@0@"'.format(f.split('.')[0]),
> +            '-DIGT_IMGDIR="@0@"'.format(imgdir),
>  	] + (iga64_assembly_sources.contains(f) ? [ '-ffat-lto-objects' ] : []))
>  
>      lib_intermediates += lib
> diff --git a/meson.build b/meson.build
> index 2f663dc03..38311f6e3 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -291,6 +291,7 @@ vmwgfxdir = join_paths(libexecdir, 'vmwgfx')
>  mandir = get_option('mandir')
>  pkgconfigdir = join_paths(libdir, 'pkgconfig')
>  python3 = find_program('python3', required : true)
> +imgdir = join_paths(build_root, 'data')
>  
>  if get_option('use_rpath')
>  	# Set up runpath for the test executables towards libigt.so.
> @@ -386,6 +387,7 @@ endif
>  subdir('overlay')
>  subdir('man')
>  subdir('docs')
> +subdir('data')
>  
>  message('Build options')
>  message('=============')
> diff --git a/tests/meson.build b/tests/meson.build
> index f8a0ab836..83986ee87 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -514,11 +514,4 @@ if not meson.is_cross_build()
>  			output : 'gem_stress.testlist')
>  endif
>  
> -image_files = [
> -  '1080p-left.png',
> -  '1080p-right.png',
> -  'pass.png',
> -]
> -install_data(sources : image_files, install_dir : datadir)
> -
>  subdir('intel-ci')
> -- 
> 2.43.0
>