Skip to contentSkip to conversation

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

PATCH In review Thomas Huth 4 participants 5 messages Aug 11, 2021 – Aug 12, 2021 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

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

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.

---
 storage-daemon/meson.build | 8 ++++----
 tests/qtest/meson.build    | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)
storage-daemon/meson.build +4 -4
index 68852f3d25..49c9d2eac9 100644
@@ -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
tests/qtest/meson.build +5 -2
index e22a0792c5..2bc3efd49f 100644
@@ -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
Signature · 1 line
2.27.0
#2 lore raw
In reply to Thomas Huth
Quoted 2 lines · Thomas Huth

vhost-user-blk-test needs the qemu-storage-deamon, otherwise it

typo: 'daemon'

Quoted 2 lines

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

-- PMM

Reviewed-by on v1 1/1
#3 lore raw
In reply to Thomas Huth
Quoted 9 lines · Thomas Huth

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.

---
 storage-daemon/meson.build | 8 ++++----
 tests/qtest/meson.build    | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

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

Signature · 3 lines
|: 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 :|
#4 lore raw
Quoted 15 lines · Daniel P. Berrangé
Quoted 9 lines · Thomas Huth

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.

---
 storage-daemon/meson.build | 8 ++++----
 tests/qtest/meson.build    | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)
Quoted 6 lines

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