storage-daemon: Add missing build dependency to the vhost-user-blk-test
vhost-user-blk-test needs the qemu-storage-daemon, otherwise it currently hangs. So make sure that we build the daemon before running the tests. Message-Id: <20210811094705.131314-1-thuth@redhat.com> Tested-by: Alexander Bulekov <alxndr@bu.edu> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
a1f0f36838
commit
cc1838c25d
@ -6,7 +6,7 @@ subdir('qapi')
|
|||||||
|
|
||||||
if have_tools
|
if have_tools
|
||||||
qsd_ss = qsd_ss.apply(config_host, strict: false)
|
qsd_ss = qsd_ss.apply(config_host, strict: false)
|
||||||
executable('qemu-storage-daemon',
|
qsd = executable('qemu-storage-daemon',
|
||||||
qsd_ss.sources(),
|
qsd_ss.sources(),
|
||||||
dependencies: qsd_ss.dependencies(),
|
dependencies: qsd_ss.dependencies(),
|
||||||
install: true)
|
install: true)
|
||||||
|
@ -276,7 +276,10 @@ foreach dir : target_dirs
|
|||||||
endif
|
endif
|
||||||
qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vmstate-daemon.sh')
|
qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vmstate-daemon.sh')
|
||||||
qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base)
|
qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base)
|
||||||
|
if have_tools and have_vhost_user_blk_server
|
||||||
qtest_env.set('QTEST_QEMU_STORAGE_DAEMON_BINARY', './storage-daemon/qemu-storage-daemon')
|
qtest_env.set('QTEST_QEMU_STORAGE_DAEMON_BINARY', './storage-daemon/qemu-storage-daemon')
|
||||||
|
test_deps += [qsd]
|
||||||
|
endif
|
||||||
|
|
||||||
foreach test : target_qtests
|
foreach test : target_qtests
|
||||||
# Executables are shared across targets, declare them only the first time we
|
# Executables are shared across targets, declare them only the first time we
|
||||||
|
Loading…
Reference in New Issue
Block a user