[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/11] storage-daemon: Add missing build dependency to the vhost-u
From: |
Thomas Huth |
Subject: |
[PULL 03/11] storage-daemon: Add missing build dependency to the vhost-user-blk-test |
Date: |
Sat, 14 Aug 2021 08:09:48 +0200 |
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>
---
storage-daemon/meson.build | 8 ++++----
tests/qtest/meson.build | 7 +++++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build
index 68852f3d25..49c9d2eac9 100644
--- a/storage-daemon/meson.build
+++ b/storage-daemon/meson.build
@@ -6,8 +6,8 @@ subdir('qapi')
if have_tools
qsd_ss = qsd_ss.apply(config_host, strict: false)
- executable('qemu-storage-daemon',
- qsd_ss.sources(),
- dependencies: qsd_ss.dependencies(),
- install: true)
+ qsd = executable('qemu-storage-daemon',
+ qsd_ss.sources(),
+ dependencies: qsd_ss.dependencies(),
+ install: true)
endif
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index e22a0792c5..2bc3efd49f 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -276,8 +276,11 @@ foreach dir : target_dirs
endif
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_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
# Executables are shared across targets, declare them only the first time
we
# encounter them
--
2.27.0
- [PULL 00/11] Optional gitlab-CI and doc fixes for -rc4, Thomas Huth, 2021/08/14
- [PULL 01/11] gitlab: exclude sparc-softmmu and riscv32-softmmu from cross builds, Thomas Huth, 2021/08/14
- [PULL 05/11] fuzz: avoid building twice, when running on gitlab, Thomas Huth, 2021/08/14
- [PULL 02/11] gitlab: skip many more targets in windows cross builds, Thomas Huth, 2021/08/14
- [PULL 04/11] tests/qtest/vhost-user-blk-test: Check whether qemu-storage-daemon is available, Thomas Huth, 2021/08/14
- [PULL 03/11] storage-daemon: Add missing build dependency to the vhost-user-blk-test,
Thomas Huth <=
- [PULL 09/11] docs/about/removed-features: Document removed HMP commands from QEMU v2.12, Thomas Huth, 2021/08/14
- [PULL 06/11] docs/about/removed-features: Document removed CLI options from QEMU v2.12, Thomas Huth, 2021/08/14
- [PULL 07/11] docs/about/removed-features: Document removed CLI options from QEMU v3.0, Thomas Huth, 2021/08/14
- [PULL 08/11] docs/about/removed-features: Document removed CLI options from QEMU v3.1, Thomas Huth, 2021/08/14
- [PULL 10/11] docs/about/removed-features: Document removed devices from older QEMU versions, Thomas Huth, 2021/08/14
- [PULL 11/11] docs/about/removed-features: Document removed machines from older QEMU versions, Thomas Huth, 2021/08/14
- Re: [PULL 00/11] Optional gitlab-CI and doc fixes for -rc4, Peter Maydell, 2021/08/16