From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 658F310F513 for ; Fri, 22 Apr 2022 11:36:48 +0000 (UTC) Date: Fri, 22 Apr 2022 14:36:49 +0300 From: Petri Latvala To: Jessica Zhang Message-ID: References: <20220421162545.135-1-quic_jesszhan@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [igt-dev] [PATCH i-g-t v2] meson: Move MSM-specific tests to their own subdirectory List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org, robdclark@chromium.org, quic_aravindh@quicinc.com Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On Fri, Apr 22, 2022 at 11:21:28AM +0300, Petri Latvala wrote: > On Thu, Apr 21, 2022 at 09:25:45AM -0700, 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 > > --- > > meson.build | 8 ++++++++ > > tests/meson.build | 18 +++++++++++++++--- > > tests/{ => msm}/msm_mapping.c | 0 > > tests/{ => msm}/msm_recovery.c | 0 > > tests/{ => msm}/msm_submit.c | 0 > > 5 files changed, 23 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/meson.build b/meson.build > > index 3e937f5a5b98..5d6f5d5686bb 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -260,6 +260,7 @@ includedir = get_option('includedir') > > libdir = get_option('libdir') > > libexecdir = join_paths(get_option('libexecdir'), 'igt-gpu-tools') > > amdgpudir = join_paths(libexecdir, 'amdgpu') > > +msmdir = join_paths(libexecdir, 'msm') > > mandir = get_option('mandir') > > pkgconfigdir = join_paths(libdir, 'pkgconfig') > > python3 = find_program('python3', required : true) > > @@ -295,10 +296,17 @@ if get_option('use_rpath') > > amdgpudir_rpathdir = join_paths(amdgpudir_rpathdir, '..') > > endforeach > > amdgpudir_rpathdir = join_paths(amdgpudir_rpathdir, libdir) > > + > > + msmdir_rpathdir = '$ORIGIN' > > + foreach p : msmdir.split('/') > > + msmdir_rpathdir = join_paths(msmdir_rpathdir, '..') > > + endforeach > > + msmdir_rpathdir = join_paths(msmdir_rpathdir, libdir) > > else > > bindir_rpathdir = '' > > libexecdir_rpathdir = '' > > amdgpudir_rpathdir = '' > > + msmdir_rpathdir = '' > > endif > > Drop this chunk. It's only needed if msm binaries are in their own > subdirectory. As can be seen by 'msmdir_rpathdir' being unused now. And I of course missed that there was already an updated version on this... -- Petri Latvala > > > -- > Petri Latvala > > > > > > subdir('lib') > > 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 > > -- > > 2.31.0 > >