vhost-user-blk-test needs the qemu-storage-deamon, otherwise it
currently hangs. So make sure that we build the daemon before running
the tests.

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

On Wed, 11 Aug 2021 at 10:47, Thomas Huth <thuth@redhat.com> wrote:
>
> vhost-user-blk-test needs the qemu-storage-deamon, otherwise it

typo: 'daemon'

> currently hangs. So make sure that we build the daemon before running
> the tests.

-- PMM

On Wed, Aug 11, 2021 at 11:47:05AM +0200, Thomas Huth wrote:
> vhost-user-blk-test needs the qemu-storage-deamon, otherwise it
> currently hangs. So make sure that we build the daemon before running
> the tests.
> 
> 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(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


IIUC, this is the fix for the oss-fuzz test that hangs

https://lists.gnu.org/archive/html/qemu-devel/2021-08/msg01850.html

can we get this fix into 6.1, so that hopefully now we get
a clean CI pipeline for the release.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

On Thu, 12 Aug 2021 at 11:53, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Wed, Aug 11, 2021 at 11:47:05AM +0200, Thomas Huth wrote:
> > vhost-user-blk-test needs the qemu-storage-deamon, otherwise it
> > currently hangs. So make sure that we build the daemon before running
> > the tests.
> >
> > 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(-)
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
>
> IIUC, this is the fix for the oss-fuzz test that hangs
>
> https://lists.gnu.org/archive/html/qemu-devel/2021-08/msg01850.html
>
> can we get this fix into 6.1, so that hopefully now we get
> a clean CI pipeline for the release.

Only if we need an rc4 anyway; I'm not going to roll rc4 just
for tests fixes.

-- PMM

On 210811 1147, Thomas Huth wrote:
> vhost-user-blk-test needs the qemu-storage-deamon, otherwise it
> currently hangs. So make sure that we build the daemon before running
> the tests.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---

Tested-by: Alexander Bulekov <alxndr@bu.edu>