mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

storage-daemon: Add missing build dependency to the vhost-user-blk-test

Browse Source 
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:
Thomas Huth 2021-08-11 11:47:05 +02:00
parent a1f0f36838
commit cc1838c25d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage-daemon/meson.build
View File

@ -6,8 +6,8 @@ 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)
endif endif

7
tests/qtest/meson.build
View File

@ -276,8 +276,11 @@ 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)
qtest_env.set('QTEST_QEMU_STORAGE_DAEMON_BINARY', './storage-daemon/qemu-storage-daemon') if have_tools and have_vhost_user_blk_server
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
# encounter them # encounter them