From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 626F310E126 for ; Fri, 24 Mar 2023 13:44:41 +0000 (UTC) Date: Fri, 24 Mar 2023 14:44:37 +0100 From: Kamil Konieczny Message-ID: <20230324134437.lrdv43dq3u2uu7bk@kamilkon-desk1> References: <20230322082826.1770429-1-mauro.chehab@linux.intel.com> <20230322082826.1770429-6-mauro.chehab@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230322082826.1770429-6-mauro.chehab@linux.intel.com> Subject: Re: [igt-dev] [PATCH i-g-t v4 5/8] meson: get rid of tests/xe/meson.build List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: On 2023-03-22 at 09:28:23 +0100, Mauro Carvalho Chehab wrote: > From: Mauro Carvalho Chehab > > Currently, this holds just a variable used by testplan. Drop it, > cleaning up the building system. > > This change allows building the testplan documentation without > needing to build tests. > > Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Kamil Konieczny > --- > docs/meson.build | 5 +---- > docs/testplan/meson.build | 6 ++++++ > tests/meson.build | 1 - > tests/xe/meson.build | 1 - > 4 files changed, 7 insertions(+), 6 deletions(-) > delete mode 100644 tests/xe/meson.build > > diff --git a/docs/meson.build b/docs/meson.build > index 9bfec8fee80b..01edf64f04a8 100644 > --- a/docs/meson.build > +++ b/docs/meson.build > @@ -1,5 +1,2 @@ > subdir('reference') > - > -if xe_test_config != '' > - subdir('testplan') > -endif > +subdir('testplan') > diff --git a/docs/testplan/meson.build b/docs/testplan/meson.build > index 50063aa2e84f..d34a8212df76 100644 > --- a/docs/testplan/meson.build > +++ b/docs/testplan/meson.build > @@ -9,6 +9,12 @@ rst2pdf = find_program('rst2pdf', required: false) > > stylesheet = meson.current_source_dir() + '/testplan.css' > > +xe_test_config = source_root + '/tests/xe/xe_test_config.json' > + > +if not build_tests > + test_executables = [] > +endif > + > test_dict = { 'xe_tests': { > 'input': xe_test_config, 'extra_args': [] > } > diff --git a/tests/meson.build b/tests/meson.build > index 632e36e059d8..e1cccf6298a6 100644 > --- a/tests/meson.build > +++ b/tests/meson.build > @@ -502,7 +502,6 @@ test_executables += executable('sw_sync', 'sw_sync.c', > test_list += 'sw_sync' > > subdir('amdgpu') > -subdir('xe') > > subdir('v3d') > > diff --git a/tests/xe/meson.build b/tests/xe/meson.build > deleted file mode 100644 > index bb344f95d59d..000000000000 > --- a/tests/xe/meson.build > +++ /dev/null > @@ -1 +0,0 @@ > -xe_test_config = meson.current_source_dir() + '/xe_test_config.json' > -- > 2.39.2 >