[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v16 65/99] tests: device-introspect-test: cope with ARM TCG-only
From: |
Alex Bennée |
Subject: |
[PATCH v16 65/99] tests: device-introspect-test: cope with ARM TCG-only devices |
Date: |
Fri, 4 Jun 2021 16:52:38 +0100 |
From: Claudio Fontana <cfontana@suse.de>
Skip the test_device_intro_concrete for now for ARM KVM-only build,
as on ARM we currently build devices for ARM that are not
compatible with a KVM-only build.
We can remove this workaround when we fix this in KConfig etc,
and we only list and build machines that are compatible with KVM
for KVM-only builds.
Alternative implementation provided by Alex.
Suggested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/qtest/device-introspect-test.c | 32 +++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/tests/qtest/device-introspect-test.c
b/tests/qtest/device-introspect-test.c
index bbec166dbc..cb8bf6e37d 100644
--- a/tests/qtest/device-introspect-test.c
+++ b/tests/qtest/device-introspect-test.c
@@ -305,6 +305,24 @@ static void test_abstract_interfaces(void)
qtest_quit(qts);
}
+/*
+ * XXX currently we build also boards for ARM that are incompatible with KVM.
+ * We therefore need to check this explicitly, and only test virt for kvm-only
+ * arm builds.
+ * After we do the work of Kconfig etc to ensure that only KVM-compatible
boards
+ * are built for the kvm-only build, we could remove this.
+ */
+static bool skip_machine_tests(void)
+{
+#ifndef CONFIG_TCG
+ const char *arch = qtest_get_arch();
+ if (strcmp(arch, "arm") == 0 || strcmp(arch, "aarch64") == 0) {
+ return true;
+ }
+#endif /* !CONFIG_TCG */
+ return false;
+}
+
static void add_machine_test_case(const char *mname)
{
char *path, *args;
@@ -329,11 +347,15 @@ int main(int argc, char **argv)
qtest_add_func("device/introspect/none", test_device_intro_none);
qtest_add_func("device/introspect/abstract", test_device_intro_abstract);
qtest_add_func("device/introspect/abstract-interfaces",
test_abstract_interfaces);
- if (g_test_quick()) {
- qtest_add_data_func("device/introspect/concrete/defaults/none",
- g_strdup(common_args), test_device_intro_concrete);
- } else {
- qtest_cb_for_every_machine(add_machine_test_case, true);
+
+ if (!skip_machine_tests()) {
+ if (g_test_quick()) {
+ qtest_add_data_func("device/introspect/concrete/defaults/none",
+ g_strdup(common_args),
+ test_device_intro_concrete);
+ } else {
+ qtest_cb_for_every_machine(add_machine_test_case, true);
+ }
}
return g_test_run();
--
2.20.1
- Re: [PATCH v16 98/99] configure: allow the overriding of default-config in the build, (continued)
- [PATCH v16 22/99] target/arm: tcg: split m_helper user-only and sysemu-only parts, Alex Bennée, 2021/06/04
- [PATCH v16 14/99] accel: add cpu_reset, Alex Bennée, 2021/06/04
- [PATCH v16 81/99] target/arm: tcg-sve: rename the narrow_vq and change_el functions, Alex Bennée, 2021/06/04
- [PATCH v16 66/99] tests: do not run qom-test on all machines for ARM KVM-only, Alex Bennée, 2021/06/04
- [PATCH v16 74/99] target/arm: cpu-sve: make cpu_sve_finalize_features return bool, Alex Bennée, 2021/06/04
- [PATCH v16 65/99] tests: device-introspect-test: cope with ARM TCG-only devices,
Alex Bennée <=
- [PATCH v16 50/99] target/arm: fix style of arm_cpu_do_interrupt functions before move, Alex Bennée, 2021/06/04
- [PATCH v16 15/99] target/arm: move translate modules to tcg/, Alex Bennée, 2021/06/04
- [PATCH v16 63/99] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM, Alex Bennée, 2021/06/04
- [PATCH v16 54/99] target/arm: move TCGCPUOps to tcg/tcg-cpu.c, Alex Bennée, 2021/06/04
- [PATCH v16 95/99] hw/arm: add dependency on OR_IRQ for XLNX_VERSAL, Alex Bennée, 2021/06/04