From: Claudio Fontana <cfontana@suse.de>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Pavel Dovgalyuk" <dovgaluk@ispras.ru>,
"Claudio Fontana" <cfontana@suse.de>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v3 2/3] qtest: unbreak non-TCG builds in bios-tables-test
Date: Tue, 13 Oct 2020 16:38:05 +0200 [thread overview]
Message-ID: <20201013143806.14321-3-cfontana@suse.de> (raw)
In-Reply-To: <20201013143806.14321-1-cfontana@suse.de>
the tests assume TCG is available, thus breaking
for TCG-only tests, where only the TCG accelerator option
is passed to the QEMU binary.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
tests/qtest/bios-tables-test.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 5647624492..18f535d4e8 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -127,6 +127,9 @@ static void free_test_data(test_data *data)
{
int i;
+ if (!data->tables) {
+ return;
+ }
for (i = 0; i < data->tables->len; ++i) {
cleanup_table_descriptor(&g_array_index(data->tables, AcpiSdtTable, i));
}
@@ -656,6 +659,13 @@ static void test_acpi_one(const char *params, test_data *data)
char *args;
bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
+#ifndef CONFIG_TCG
+ if (data->tcg_only) {
+ g_test_skip("TCG disabled, skipping ACPI tcg_only test");
+ return;
+ }
+#endif /* CONFIG_TCG */
+
if (use_uefi) {
/*
* TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)
--
2.26.2
next prev parent reply other threads:[~2020-10-13 14:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 14:38 [PATCH v3 0/3] unbreak non-tcg builds Claudio Fontana
2020-10-13 14:38 ` [PATCH v3 1/3] tests/Makefile.include: " Claudio Fontana
2020-10-13 14:38 ` Claudio Fontana [this message]
2020-10-13 14:38 ` [PATCH v3 3/3] replay: do not build if TCG is not available Claudio Fontana
2020-10-13 17:12 ` Paolo Bonzini
2020-10-13 17:17 ` Claudio Fontana
2020-10-13 17:25 ` Paolo Bonzini
2020-10-13 17:37 ` Claudio Fontana
2020-10-13 14:55 ` [PATCH v3 0/3] unbreak non-tcg builds Philippe Mathieu-Daudé
2020-10-13 16:47 ` Claudio Fontana
2020-10-13 16:51 ` Daniel P. Berrangé
2020-10-26 15:28 ` Claudio Fontana
2020-10-26 15:34 ` Claudio Fontana
2021-01-10 17:51 ` Claudio Fontana
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=20201013143806.14321-3-cfontana@suse.de \
--to=cfontana@suse.de \
--cc=alex.bennee@linaro.org \
--cc=dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).