[igt-dev] [PATCH i-g-t v2 12/12] runner/meson.build: fix minimal build

[Mauro Carvalho Chehab]

On Fri, 31 Mar 2023 11:13:19 +0200
Kamil Konieczny <kamil.konieczny at linux.intel.com> wrote:

> Hi Mauro,
> 
> On 2023-03-30 at 07:42:21 +0200, Mauro Carvalho Chehab wrote:
> > From: Mauro Carvalho Chehab <mchehab at kernel.org>
> > 
> > Minimal pipeline s now failing:  
> ------------------ ^
> s/s/is/
> 
> > 	https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/38824636
> > 
> > This doesn't seem to be related to the patches at the series from
> > where the issue was reported, but addressing it is simple enough:
> > just remove the error and change the logic to properly validate
> > the possible options.
> > 
> > Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
> > ---
> >  runner/meson.build | 6 +-----
> >  1 file changed, 1 insertion(+), 5 deletions(-)
> > 
> > diff --git a/runner/meson.build b/runner/meson.build
> > index dadfc75f0ca7..c62303ce35c5 100644
> > --- a/runner/meson.build
> > +++ b/runner/meson.build
> > @@ -24,11 +24,7 @@ if liboping.found()
> >  	runner_c_args += '-DHAVE_OPING=1'
> >  endif
> >  
> > -if not build_tests and jsonc.found()
> > -	error('Building test runner requires building tests')
> > -endif  
> 
> imho:
> if jsonc.found() and not build_tests 
> 
> is more clear what we need here.

IMO, this is less clear ;-) I mean, refusing to run because jsonc is 
installed and -Dtests=false sounds a very bad idea.

What we want instead is to have the runner built only if build_tests
is selected (and the required jsonc library is installed). 

This is what this patch does.

> Btw this is error from that build link:
> 
> docs/testplan/meson.build:24:1: ERROR:  Invalid use of addition: can only concatenate list (not "str") to list

This was due to CI Gitlab pipeline usage of meson 0.49.2. With meson 1.0.0 (shipped with Fedora), this doesn't occur.

Anyway, the fix for it was fold at the patch that introduced the issue in docs/testplan/meson.build (patch 09/12).

> I do not see how runner/meson.build is related to docs/testplan/meson.build ?

It is not related at all. Yet, without this patch, the error may break
CI pipelines if:

	- jsonc is installed
	- meson is called with:
	  meson -Dtests=disabled build

Regards,
Mauro