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

Kamil Konieczny kamil.konieczny at linux.intel.com
Fri Mar 31 09:13:19 UTC 2023


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.
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

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

+cc Petri

Regards,
Kamil

> -
> -if jsonc.found()
> +if jsonc.found() and build_tests
>  	subdir('testdata')
>  
>  	runnerlib = static_library('igt_runner', runnerlib_sources,
> -- 
> 2.39.2
> 


More information about the igt-dev mailing list