summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2021-08-11 11:59:49 +0200
committerThomas Huth <thuth@redhat.com>2021-08-11 13:40:01 +0200
commitb063c290f3d28a3142e90a1717b26b55ec1a7d17 (patch)
tree16f3395b794606b4cf4500ea04e4feae397b43a3
parentcc1838c25d55e7f478cd493431679337e24e1b72 (diff)
downloadfocaccia-qemu-b063c290f3d28a3142e90a1717b26b55ec1a7d17.tar.gz
focaccia-qemu-b063c290f3d28a3142e90a1717b26b55ec1a7d17.zip
tests/qtest/vhost-user-blk-test: Check whether qemu-storage-daemon is available
The vhost-user-blk-test currently hangs if QTEST_QEMU_STORAGE_DAEMON_BINARY
points to a non-existing binary. Let's improve this situation by checking
for the availability of the binary first, so we can fail gracefully if
it is not accessible.

Message-Id: <20210811095949.133462-1-thuth@redhat.com>
Reviewed-by: Alexander Bulekov <alxndr@bu.edu>
Tested-by: Alexander Bulekov <alxndr@bu.edu>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to '')
-rw-r--r--tests/qtest/vhost-user-blk-test.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk-test.c
index 8796c74ca4..6f108a1b62 100644
--- a/tests/qtest/vhost-user-blk-test.c
+++ b/tests/qtest/vhost-user-blk-test.c
@@ -789,6 +789,14 @@ static const char *qtest_qemu_storage_daemon_binary(void)
         exit(0);
     }
 
+    /* If we've got a path to the binary, check whether we can access it */
+    if (strchr(qemu_storage_daemon_bin, '/') &&
+        access(qemu_storage_daemon_bin, X_OK) != 0) {
+        fprintf(stderr, "ERROR: '%s' is not accessible\n",
+                qemu_storage_daemon_bin);
+        exit(1);
+    }
+
     return qemu_storage_daemon_bin;
 }