[i-g-t V2 1/3] tests/panfrost: Move Panfrost tests to new dir

[Kamil Konieczny]

Hi Modem,,
On 2024-06-25 at 10:26:59 +0530, Modem, Bhanuprakash wrote:
> Hi All,
> 
> I'm going to merge this series, please let me know if you have any concerns.
> 
> - Bhanu

Feel free to merge, remember to clarify in description that
this also moves generated binaries.

Regards,
Kamil

> 
> On 18-06-2024 02:09 pm, Kamil Konieczny wrote:
> > Hi Bhanuprakash,
> > On 2024-06-12 at 12:33:33 +0530, Bhanuprakash Modem wrote:
> > > Move all Panfrost specific tests (tests/panfrost_*) to
> > > new dir (tests/panfrost/panfrost_*).
> > 
> > Add also here that binaries will be placed in subdir
> > <build>/tests/panfrost
> > 
> > > 
> > 
> > + Cc: Helen Koike <helen.koike at collabora.com>
> > 
> > Regards,
> > Kamil
> > 
> > > Cc: Boris Brezillon <boris.brezillon at collabora.com>
> > > Cc: Alyssa Rosenzweig <alyssa at collabora.com>
> > > Cc: Kamil Konieczny <kamil.konieczny at linux.intel.com>
> > > Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
> > > Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
> > > ---
> > >   meson.build                               |  8 ++++++++
> > >   tests/meson.build                         |  6 ++----
> > >   tests/panfrost/meson.build                | 15 +++++++++++++++
> > >   tests/{ => panfrost}/panfrost_gem_new.c   |  0
> > >   tests/{ => panfrost}/panfrost_get_param.c |  0
> > >   tests/{ => panfrost}/panfrost_prime.c     |  0
> > >   tests/{ => panfrost}/panfrost_submit.c    |  0
> > >   7 files changed, 25 insertions(+), 4 deletions(-)
> > >   create mode 100644 tests/panfrost/meson.build
> > >   rename tests/{ => panfrost}/panfrost_gem_new.c (100%)
> > >   rename tests/{ => panfrost}/panfrost_get_param.c (100%)
> > >   rename tests/{ => panfrost}/panfrost_prime.c (100%)
> > >   rename tests/{ => panfrost}/panfrost_submit.c (100%)
> > > 
> > > diff --git a/meson.build b/meson.build
> > > index ab44aadb1..701a5cc35 100644
> > > --- a/meson.build
> > > +++ b/meson.build
> > > @@ -276,6 +276,7 @@ includedir = get_option('includedir')
> > >   libdir = get_option('libdir')
> > >   libexecdir = join_paths(get_option('libexecdir'), 'igt-gpu-tools')
> > >   amdgpudir = join_paths(libexecdir, 'amdgpu')
> > > +panfrostdir = join_paths(libexecdir, 'panfrost')
> > >   v3ddir = join_paths(libexecdir, 'v3d')
> > >   vc4dir = join_paths(libexecdir, 'vc4')
> > >   vmwgfxdir = join_paths(libexecdir, 'vmwgfx')
> > > @@ -315,6 +316,12 @@ if get_option('use_rpath')
> > >   	endforeach
> > >   	amdgpudir_rpathdir = join_paths(amdgpudir_rpathdir, libdir)
> > > +	panfrost_rpathdir = '$ORIGIN'
> > > +	foreach p : panfrostdir.split('/')
> > > +		panfrost_rpathdir = join_paths(panfrost_rpathdir, '..')
> > > +	endforeach
> > > +	panfrost_rpathdir = join_paths(panfrost_rpathdir, libdir)
> > > +
> > >   	v3d_rpathdir = '$ORIGIN'
> > >   	foreach p : v3ddir.split('/')
> > >   		v3d_rpathdir = join_paths(v3d_rpathdir, '..')
> > > @@ -336,6 +343,7 @@ else
> > >   	bindir_rpathdir = ''
> > >   	libexecdir_rpathdir = ''
> > >   	amdgpudir_rpathdir = ''
> > > +	panfrost_rpathdir = ''
> > >   	v3d_rpathdir = ''
> > >   	vc4_rpathdir = ''
> > >   	vmwgfx_rpathdir = ''
> > > diff --git a/tests/meson.build b/tests/meson.build
> > > index 758ae090c..16896de99 100644
> > > --- a/tests/meson.build
> > > +++ b/tests/meson.build
> > > @@ -65,10 +65,6 @@ test_progs = [
> > >   	'kms_vrr',
> > >   	'kms_writeback',
> > >   	'meta_test',
> > > -	'panfrost_get_param',
> > > -	'panfrost_gem_new',
> > > -	'panfrost_prime',
> > > -	'panfrost_submit',
> > >   	'prime_udl',
> > >   	'prime_vgem',
> > >   	'sriov_basic',
> > > @@ -461,6 +457,8 @@ endif
> > >   subdir('amdgpu')
> > > +subdir('panfrost')
> > > +
> > >   subdir('v3d')
> > >   subdir('vc4')
> > > diff --git a/tests/panfrost/meson.build b/tests/panfrost/meson.build
> > > new file mode 100644
> > > index 000000000..b633d1be9
> > > --- /dev/null
> > > +++ b/tests/panfrost/meson.build
> > > @@ -0,0 +1,15 @@
> > > +panfrost_progs = [
> > > +	'panfrost_get_param',
> > > +	'panfrost_gem_new',
> > > +	'panfrost_prime',
> > > +	'panfrost_submit',
> > > +]
> > > +
> > > +foreach prog : panfrost_progs
> > > +	test_executables += executable(prog, prog + '.c',
> > > +				       dependencies : test_deps,
> > > +				       install_dir : panfrostdir,
> > > +				       install_rpath : panfrost_rpathdir,
> > > +				       install : true)
> > > +	test_list += join_paths('panfrost', prog)
> > > +endforeach
> > > diff --git a/tests/panfrost_gem_new.c b/tests/panfrost/panfrost_gem_new.c
> > > similarity index 100%
> > > rename from tests/panfrost_gem_new.c
> > > rename to tests/panfrost/panfrost_gem_new.c
> > > diff --git a/tests/panfrost_get_param.c b/tests/panfrost/panfrost_get_param.c
> > > similarity index 100%
> > > rename from tests/panfrost_get_param.c
> > > rename to tests/panfrost/panfrost_get_param.c
> > > diff --git a/tests/panfrost_prime.c b/tests/panfrost/panfrost_prime.c
> > > similarity index 100%
> > > rename from tests/panfrost_prime.c
> > > rename to tests/panfrost/panfrost_prime.c
> > > diff --git a/tests/panfrost_submit.c b/tests/panfrost/panfrost_submit.c
> > > similarity index 100%
> > > rename from tests/panfrost_submit.c
> > > rename to tests/panfrost/panfrost_submit.c
> > > -- 
> > > 2.43.2
> > >