[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 11/12] qtest/bios-tables-test: Make test build-independent fro
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v7 11/12] qtest/bios-tables-test: Make test build-independent from accelerator |
Date: |
Wed, 5 May 2021 14:58:05 +0200 |
Now that we can probe if the TCG accelerator is available
at runtime with a QMP command, do it once at the beginning
and only register the tests we can run.
We can then replace the #ifdef'ry by an assertion.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/qtest/bios-tables-test.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index ad877baeb1b..762d154b340 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -97,6 +97,7 @@ typedef struct {
QTestState *qts;
} test_data;
+static bool tcg_accel_available;
static char disk[] = "tests/acpi-test-disk-XXXXXX";
static const char *data_dir = "tests/data/acpi";
#ifdef CONFIG_IASL
@@ -718,12 +719,7 @@ 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 */
+ assert(!data->tcg_only || tcg_accel_available);
args = test_acpi_create_args(data, params, use_uefi);
data->qts = qtest_init(args);
@@ -1506,6 +1502,8 @@ int main(int argc, char *argv[])
g_test_init(&argc, &argv, NULL);
+ tcg_accel_available = qtest_has_accel("tcg");
+
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
ret = boot_sector_init(disk);
if (ret) {
@@ -1554,10 +1552,10 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc);
qtest_add_func("acpi/microvm/ioapic2", test_acpi_microvm_ioapic2);
qtest_add_func("acpi/microvm/oem-fields",
test_acpi_oem_fields_microvm);
- if (strcmp(arch, "x86_64") == 0) {
+ if (strcmp(arch, "x86_64") == 0 && tcg_accel_available) {
qtest_add_func("acpi/microvm/pcie", test_acpi_microvm_pcie_tcg);
}
- } else if (strcmp(arch, "aarch64") == 0) {
+ } else if (strcmp(arch, "aarch64") == 0 && tcg_accel_available) {
qtest_add_func("acpi/virt", test_acpi_virt_tcg);
qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem);
qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp);
--
2.26.3
- Re: [PATCH v7 02/12] accel: Introduce 'query-accels' QMP command, (continued)
- [PATCH v7 03/12] qtest: Add qtest_has_accel() method, Philippe Mathieu-Daudé, 2021/05/05
- [PATCH v7 01/12] MAINTAINERS: Add qtest/arm-cpu-features.c to ARM TCG CPUs section, Philippe Mathieu-Daudé, 2021/05/05
- [PATCH v7 04/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for KVM, Philippe Mathieu-Daudé, 2021/05/05
- [PATCH v7 05/12] qtest/arm-cpu-features: Restrict sve_tests_sve_off_kvm test to KVM, Philippe Mathieu-Daudé, 2021/05/05
- [PATCH v7 06/12] qtest/arm-cpu-features: Remove TCG fallback to KVM specific tests, Philippe Mathieu-Daudé, 2021/05/05
- [PATCH v7 07/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for TCG, Philippe Mathieu-Daudé, 2021/05/05
- [PATCH v7 08/12] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64, Philippe Mathieu-Daudé, 2021/05/05
- [PATCH v7 09/12] qtest/bios-tables-test: Rename tests not TCG specific, Philippe Mathieu-Daudé, 2021/05/05
- [PATCH v7 10/12] qtest/bios-tables-test: Rename TCG specific tests, Philippe Mathieu-Daudé, 2021/05/05
- [PATCH v7 11/12] qtest/bios-tables-test: Make test build-independent from accelerator,
Philippe Mathieu-Daudé <=
- [PATCH v7 12/12] qtest: Do not restrict bios-tables-test to Aarch64 hosts anymore, Philippe Mathieu-Daudé, 2021/05/05
- Re: [PATCH v7 00/12] qtests: Check accelerator available at runtime via QMP 'query-accels', Philippe Mathieu-Daudé, 2021/05/05