From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Claudio Fontana <cfontana@suse.de>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Andrew Jones" <drjones@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
qemu-arm@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>
Subject: [PATCH 3/6] qtest/bios-tables-test: Make test build-independent from accelerator
Date: Fri, 12 Mar 2021 00:11:59 +0100 [thread overview]
Message-ID: <20210311231202.1536040-4-philmd@redhat.com> (raw)
In-Reply-To: <20210311231202.1536040-1-philmd@redhat.com>
Now than we can probe if the TCG accelerator is available
at runtime with a QMP command, we can remove the #ifdef'ry.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/qtest/bios-tables-test.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index e020c83d2a5..73378f9da94 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -718,15 +718,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 */
-
args = test_acpi_create_args(data, params, use_uefi);
data->qts = qtest_init(args);
+ if (data->tcg_only && !qtest_probe_accel(data->qts, "tcg")) {
+ g_test_skip("TCG not available, skipping test");
+ goto done;
+ }
+
test_acpi_load_tables(data, use_uefi);
if (getenv(ACPI_REBUILD_EXPECTED_AML)) {
@@ -745,6 +743,7 @@ static void test_acpi_one(const char *params, test_data *data)
test_smbios_structs(data);
}
+done:
qtest_quit(data->qts);
g_free(args);
}
--
2.26.2
next prev parent reply other threads:[~2021-03-11 23:16 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 23:11 [PATCH 0/6] qtests: Check accelerator available at runtime via QMP 'query-accels' Philippe Mathieu-Daudé
2021-03-11 23:11 ` [PATCH 1/6] accel: Introduce 'query-accels' QMP command Philippe Mathieu-Daudé
2021-03-12 7:42 ` Marc-André Lureau
2021-03-12 8:11 ` Thomas Huth
2021-03-12 8:48 ` Andrew Jones
2021-03-12 8:52 ` Claudio Fontana
2021-03-12 9:09 ` Andrew Jones
2021-03-12 9:01 ` Paolo Bonzini
2021-03-12 9:17 ` Andrew Jones
2021-03-12 9:28 ` Paolo Bonzini
2021-03-12 8:46 ` Claudio Fontana
2021-03-12 9:04 ` Paolo Bonzini
2021-03-15 17:53 ` Eric Blake
2021-03-16 6:51 ` Markus Armbruster
2021-03-16 8:21 ` Paolo Bonzini
2021-03-16 9:02 ` Philippe Mathieu-Daudé
2021-03-16 10:26 ` Philippe Mathieu-Daudé
2021-03-16 10:39 ` Markus Armbruster
2021-03-16 10:55 ` Philippe Mathieu-Daudé
2021-03-16 12:41 ` Markus Armbruster
2021-03-16 12:48 ` Thomas Huth
2021-03-16 15:20 ` Philippe Mathieu-Daudé
2021-03-11 23:11 ` [PATCH 2/6] tests/qtest: Add qtest_probe_accel() method Philippe Mathieu-Daudé
2021-03-12 8:16 ` Thomas Huth
2021-03-12 8:58 ` Andrew Jones
2021-03-11 23:11 ` Philippe Mathieu-Daudé [this message]
2021-03-11 23:12 ` [PATCH 4/6] qtest/arm-cpu-features: Check KVM availability at runtime Philippe Mathieu-Daudé
2021-03-12 9:05 ` Paolo Bonzini
2021-03-12 9:32 ` Philippe Mathieu-Daudé
2021-03-12 9:50 ` Paolo Bonzini
2021-03-11 23:12 ` [PATCH 5/6] qtest/arm-cpu-features: Check TCG " Philippe Mathieu-Daudé
2021-03-12 9:05 ` Paolo Bonzini
2021-03-11 23:12 ` [PATCH 6/6] tests/qtest: Do not restrict bios-tables-test to Aarch64 hosts anymore Philippe Mathieu-Daudé
2021-03-12 9:06 ` Paolo Bonzini
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=20210311231202.1536040-4-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=cfontana@suse.de \
--cc=drjones@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/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).