[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v13 52/80] tests: device-introspect-test: cope with ARM TCG-only de
From: |
Claudio Fontana |
Subject: |
[RFC v13 52/80] tests: device-introspect-test: cope with ARM TCG-only devices |
Date: |
Wed, 14 Apr 2021 13:26:22 +0200 |
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.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
tests/qtest/device-introspect-test.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/tests/qtest/device-introspect-test.c
b/tests/qtest/device-introspect-test.c
index bbec166dbc..1ff15e2247 100644
--- a/tests/qtest/device-introspect-test.c
+++ b/tests/qtest/device-introspect-test.c
@@ -329,12 +329,30 @@ 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);
+
+ /*
+ * 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.
+ */
+#ifndef CONFIG_TCG
+ {
+ const char *arch = qtest_get_arch();
+ if (strcmp(arch, "arm") == 0 || strcmp(arch, "aarch64") == 0) {
+ goto add_machine_test_done;
+ }
+ }
+#endif /* !CONFIG_TCG */
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);
}
+ goto add_machine_test_done;
+ add_machine_test_done:
return g_test_run();
}
--
2.26.2
- [RFC v13 38/80] target/arm: rename handle_semihosting to tcg_handle_semihosting, (continued)
- [RFC v13 38/80] target/arm: rename handle_semihosting to tcg_handle_semihosting, Claudio Fontana, 2021/04/14
- [RFC v13 45/80] MAINTAINERS: update arm kvm maintained files to all in target/arm/kvm/, Claudio Fontana, 2021/04/14
- [RFC v13 37/80] target/arm: move exception code out of tcg/helper.c, Claudio Fontana, 2021/04/14
- [RFC v13 51/80] tests: do not run test-hmp on all machines for ARM KVM-only, Claudio Fontana, 2021/04/14
- [RFC v13 47/80] target/arm: remove broad "else" statements when checking accels, Claudio Fontana, 2021/04/14
- [RFC v13 49/80] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM, Claudio Fontana, 2021/04/14
- [RFC v13 50/80] tests: restrict TCG-only arm-cpu-features tests to TCG builds, Claudio Fontana, 2021/04/14
- [RFC v13 34/80] target/arm: remove now useless ifndef from fp_exception_el, Claudio Fontana, 2021/04/14
- [RFC v13 29/80] target/arm: move a15 cpu model away from the TCG-only models, Claudio Fontana, 2021/04/14
- [RFC v13 41/80] target/arm: move cpu_tcg to tcg/tcg-cpu-models.c, Claudio Fontana, 2021/04/14
- [RFC v13 52/80] tests: device-introspect-test: cope with ARM TCG-only devices,
Claudio Fontana <=
- [RFC v13 53/80] tests: do not run qom-test on all machines for ARM KVM-only, Claudio Fontana, 2021/04/14
- [RFC v13 55/80] target/arm: create kvm cpu accel class, Claudio Fontana, 2021/04/14
- [RFC v13 60/80] target/arm: cpu-sve: rename functions according to module prefix, Claudio Fontana, 2021/04/14
- [RFC v13 61/80] target/arm: cpu-sve: split TCG and KVM functionality, Claudio Fontana, 2021/04/14
- [RFC v13 54/80] Revert "target/arm: Restrict v8M IDAU to TCG", Claudio Fontana, 2021/04/14
- [RFC v13 56/80] target/arm: move kvm post init initialization to kvm cpu accel, Claudio Fontana, 2021/04/14
- [RFC v13 57/80] target/arm: add tcg cpu accel class, Claudio Fontana, 2021/04/14
- [RFC v13 59/80] target/arm: cpu-sve: new module, Claudio Fontana, 2021/04/14
- [RFC v13 65/80] target/arm: arch_dump: restrict ELFCLASS64 to AArch64, Claudio Fontana, 2021/04/14
- [RFC v13 62/80] target/arm: cpu-sve: make cpu_sve_finalize_features return bool, Claudio Fontana, 2021/04/14