From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>
Subject: [PULL 8/9] tests/qtest/boot-order-test: Check whether machines are available
Date: Wed, 22 Dec 2021 12:32:58 +0100 [thread overview]
Message-ID: <20211222113259.823203-9-thuth@redhat.com> (raw)
In-Reply-To: <20211222113259.823203-1-thuth@redhat.com>
Machines might not always be compiled into the QEMU binary, so
we should skip the test instead of failing if it is not available.
Message-Id: <20211220081054.151515-5-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/boot-order-test.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tests/qtest/boot-order-test.c b/tests/qtest/boot-order-test.c
index fac580d6c4..f1f59b1261 100644
--- a/tests/qtest/boot-order-test.c
+++ b/tests/qtest/boot-order-test.c
@@ -34,6 +34,11 @@ static void test_a_boot_order(const char *machine,
uint64_t actual;
QTestState *qts;
+ if (machine && !qtest_has_machine(machine)) {
+ g_test_skip("Machine is not available");
+ return;
+ }
+
qts = qtest_initf("-nodefaults%s%s %s", machine ? " -M " : "",
machine ?: "", test_args);
actual = read_boot_order(qts);
--
2.27.0
next prev parent reply other threads:[~2021-12-22 11:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-22 11:32 [PULL 0/9] qtest fixes and improvements Thomas Huth
2021-12-22 11:32 ` [PULL 1/9] failover: Silence warning messages during qtest Thomas Huth
2021-12-22 11:32 ` [PULL 2/9] tests/qtest/boot-serial-test: Silence the warning about deprecated sga device Thomas Huth
2021-12-22 11:32 ` [PULL 3/9] tests/qtest: Make the filter tests independent from a specific NIC Thomas Huth
2021-12-22 11:32 ` [PULL 4/9] MAINTAINERS: Update COLO Proxy section Thomas Huth
2021-12-22 11:32 ` [PULL 5/9] tests/qtest: Add a function that checks whether a device is available Thomas Huth
2021-12-22 11:32 ` [PULL 6/9] tests/qtest: Improve endianness-test to work with missing machines and devices Thomas Huth
2021-12-22 11:32 ` [PULL 7/9] tests/qtest/cdrom-test: Check whether devices are available before using them Thomas Huth
2021-12-22 11:32 ` Thomas Huth [this message]
2021-12-22 11:32 ` [PULL 9/9] tests/qtest/virtio-net-failover: Use g_file_open_tmp() to create temporary file Thomas Huth
2021-12-22 18:00 ` [PULL 0/9] qtest fixes and improvements Richard Henderson
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=20211222113259.823203-9-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).