[libvirt PATCH] meson: Fix compatibility with Meson 0.58

Andrea Bolognani abologna at redhat.com
Mon May 3 07:29:12 UTC 2021


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() ],
 )
 
-- 
2.26.3




More information about the libvir-list mailing list