Re: [DRAFT PATCH 000/143] Meson integration for 5.2

[Paolo Bonzini]

On 07/08/20 12:52, Thomas Huth wrote:
> Thanks! Now, both, macOS and FreeBSD builds stop with:
> 
>  ../tests/qtest/meson.build:204:0: ERROR: Unknown variable "dbus_vmstate1".
>  https://cirrus-ci.com/task/6220295902068736?command=main#L210

diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 507ee126e7..9a7daad59d 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -76,7 +76,9 @@ if dbus_daemon.found() and 
config_host.has_key('GDBUS_CODEGEN')
                                 command: [config_host['GDBUS_CODEGEN'],
                                           '@INPUT@',
                                           '--interface-prefix', 'org.qemu',
-                                          '--generate-c-code', '@BASENAME@'])
+                                          '--generate-c-code', 
'@BASENAME@']).to_list()
+else
+  dbus_vmstate1 = []
 endif
 
 qtests_x86_64 = qtests_i386
@@ -207,7 +209,7 @@ extra_qtest_srcs = {
   'cdrom-test': files('boot-sector.c'),
   'migration-test': files('migration-helpers.c'),
   'ivshmem-test': files('../../contrib/ivshmem-server/ivshmem-server.c'),
-  'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1.to_list(),
+  'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1,
   'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'),
   'tpm-crb-swtpm-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'),
   'tpm-crb-test': files('tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'),


Easy peasy lemon squeezy! :)

Paolo