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

[Paolo Bonzini]

On 07/08/20 12:00, Thomas Huth wrote:
> FreeBSD fails since dbus-daemon is not found:
> 
>  https://cirrus-ci.com/task/6446150314098688?command=main#L203
> 
> macOS now stops because the qemu_nbd variable is not set:
> 
>  https://cirrus-ci.com/task/5038775430545408?command=main#L207

A little refactoring needed for the latter, while the former is a one-liner.

diff --git a/meson.build b/meson.build
index dbe1d08..0a24116 100644
--- a/meson.build
+++ b/meson.build
@@ -1051,12 +1051,14 @@ endif
 if have_tools
   qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep],
              dependencies: [authz, block, crypto, io, qom, qemuutil], install: 
true)
+  qemu_io = executable('qemu-io', files('qemu-io.c'),
+             dependencies: [block, qemuutil], install: true)
+  qemu_block_tools = [qemu_img, qemu_io]
   if host_machine.system() == 'linux' or host_machine.system() == 'sunos' or 
host_machine.system().endswith('bsd')
     qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
                dependencies: [block, qemuutil], install: true)
+    qemu_block_tools += [qemu_nbd]
   endif
-  qemu_io = executable('qemu-io', files('qemu-io.c'),
-             dependencies: [block, qemuutil], install: true)
 
   subdir('storage-daemon')
   subdir('contrib/rdmacm-mux')
diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
index 60e81a2..3de09fb 100644
--- a/tests/qemu-iotests/meson.build
+++ b/tests/qemu-iotests/meson.build
@@ -1,8 +1,10 @@
-dep = [qemu_img, qemu_io, qemu_nbd, emulators]
 if 'CONFIG_LINUX' in config_host
-    dep += executable('socket_scm_helper', 'socket_scm_helper.c',
-                      build_by_default: false)
+    socket_scm_helper = executable('socket_scm_helper', 'socket_scm_helper.c',
+                                    build_by_default: false)
+else
+    socket_scm_helper = []
 endif
-test('qemu-iotests', sh, args: [files('../check-block.sh')], depends: dep,
+test('qemu-iotests', sh, args: [files('../check-block.sh')],
+     depends: [qemu_block_tools, emulators, socket_scm_helper],
      suite: 'block', timeout: 10000)
 
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index c2601d9..507ee12 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -66,7 +66,7 @@ qtests_i386 = \
    'test-x86-cpuid-compat',
    'numa-test']
 
-dbus_daemon = find_program('dbus-daemon')
+dbus_daemon = find_program('dbus-daemon', required: false)
 if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN')
   # Temporarily disabled due to Patchew failures:
   #qtests_i386 += ['dbus-vmstate-test']


I pushed again to meson-poc-next, diffstat is

 configure                      |  2 +-
 hw/display/meson.build         |  7 -------
 meson.build                    | 19 +++++++++++--------
 tests/qemu-iotests/meson.build | 10 ++++++----
 tests/qtest/meson.build        |  2 +-
 5 files changed, 19 insertions(+), 21 deletions(-)

Git submodules still not fixed