[libvirt PATCH] meson: Fix compatibility with Meson 0.58

[Pavel Hrdina]

On Mon, May 03, 2021 at 09:29:12AM +0200, Andrea Bolognani wrote:
> Builds failed with
> 
>   tests/meson.build:690:0: ERROR: List item must be one
>   of <class 'str'>, not <class 'list'>
> 
> before this change.
> 
> https://gitlab.com/libvirt/libvirt/-/issues/158
> 
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---
> Test pipeline:
>   https://gitlab.com/abologna/libvirt/-/pipelines/296072074
>   (hasn't completed yet)
> 
> Should we consider this for 7.3.0? It would be great if people who
> have a very new version of Meson would be able to build the new
> version of libvirt out of the box.
> 
>  tests/meson.build | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/meson.build b/tests/meson.build
> index 05c3e90195..9900983d0c 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -687,12 +687,12 @@ foreach name : test_scripts
>    test(name, script, env: tests_env)
>  endforeach
>  
> +testenv = runutf8
> +testenv += 'VIR_TEST_FILE_ACCESS=1'
> +
>  add_test_setup(
>    'access',
> -  env: [
> -    'VIR_TEST_FILE_ACCESS=1',
> -    runutf8,
> -  ],
> +  env: testenv,
>    exe_wrapper: [ python3_prog, check_file_access_prog.path() ],
>  )

Sigh, some parts of meson supports having list in lists where string is
expected as they will expand the list. Hopefully one day they will use
this approach everywhere instead of going backwards.

Reviewed-by: Pavel Hrdina <phrdina at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20210503/f2ae37da/attachment-0001.sig>