[libvirt PATCH] meson: Fix compatibility with Meson 0.58

Andrea Bolognani posted 1 patch 2 weeks, 1 day ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20210503072912.47884-1-abologna@redhat.com
tests/meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

[libvirt PATCH] meson: Fix compatibility with Meson 0.58

Posted by Andrea Bolognani 2 weeks, 1 day ago
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@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() ],
 )
 
-- 
2.26.3

Re: [libvirt PATCH] meson: Fix compatibility with Meson 0.58

Posted by Pavel Hrdina 2 weeks, 1 day ago
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@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@redhat.com>

Re: [libvirt PATCH] meson: Fix compatibility with Meson 0.58

Posted by Peter Krempa 2 weeks, 1 day ago
On Mon, May 03, 2021 at 09:29:12 +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@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.

You'll have to coordinate with Jirka to see how far he is in the release
process.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>