]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
meson: Fix compatibility with Meson 0.58
authorAndrea Bolognani <abologna@redhat.com>
Mon, 3 May 2021 07:06:34 +0000 (09:06 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Mon, 3 May 2021 08:30:56 +0000 (10:30 +0200)
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>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
tests/meson.build

index 05c3e90195e731d9e2fab04fd643df952cb016ed..9900983d0cc075eeea7bfbdea24d1c2963616f6c 100644 (file)
@@ -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() ],
 )