qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Subject: [PULL 04/11] tests/qtest/vhost-user-blk-test: Check whether qemu-storage-daemon is available
Date: Sat, 14 Aug 2021 08:09:49 +0200	[thread overview]
Message-ID: <20210814060956.12852-5-thuth@redhat.com> (raw)
In-Reply-To: <20210814060956.12852-1-thuth@redhat.com>

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>
---
 tests/qtest/vhost-user-blk-test.c | 8 ++++++++
 1 file changed, 8 insertions(+)

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;
 }
 
-- 
2.27.0



  parent reply	other threads:[~2021-08-14  6:14 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-14  6:09 [PULL 00/11] Optional gitlab-CI and doc fixes for -rc4 Thomas Huth
2021-08-14  6:09 ` [PULL 01/11] gitlab: exclude sparc-softmmu and riscv32-softmmu from cross builds Thomas Huth
2021-08-14  6:09 ` [PULL 02/11] gitlab: skip many more targets in windows " Thomas Huth
2021-08-15 15:47   ` Peter Maydell
2021-08-14  6:09 ` [PULL 03/11] storage-daemon: Add missing build dependency to the vhost-user-blk-test Thomas Huth
2021-08-14  6:09 ` Thomas Huth [this message]
2021-08-14  6:09 ` [PULL 05/11] fuzz: avoid building twice, when running on gitlab Thomas Huth
2021-08-14  6:09 ` [PULL 06/11] docs/about/removed-features: Document removed CLI options from QEMU v2.12 Thomas Huth
2021-08-14  6:09 ` [PULL 07/11] docs/about/removed-features: Document removed CLI options from QEMU v3.0 Thomas Huth
2021-08-14  6:09 ` [PULL 08/11] docs/about/removed-features: Document removed CLI options from QEMU v3.1 Thomas Huth
2021-08-14  6:09 ` [PULL 09/11] docs/about/removed-features: Document removed HMP commands from QEMU v2.12 Thomas Huth
2021-08-14  6:09 ` [PULL 10/11] docs/about/removed-features: Document removed devices from older QEMU versions Thomas Huth
2021-08-14  6:09 ` [PULL 11/11] docs/about/removed-features: Document removed machines " Thomas Huth
2021-08-16  9:01 ` [PULL 00/11] Optional gitlab-CI and doc fixes for -rc4 Peter Maydell
2021-08-16 10:22   ` Alexander Bulekov
2021-08-16 11:11     ` Daniel P. Berrangé
2021-08-16 11:30       ` Alexander Bulekov
2021-08-16 11:40         ` Philippe Mathieu-Daudé
2021-08-16 12:00           ` Alexander Bulekov
2021-08-16 11:44         ` Daniel P. Berrangé
2021-08-17  7:23       ` Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210814060956.12852-5-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).