[PATCH 3/8] domaincapstest: Allow tests of all capability variants
Currently only the default variant ("") and "+hvf" are present in our
test data but upcoming patches will add another variant.
Upcoming test variants may not require any special handling so we should
be able to handle them using the default code path now that 'variant' is
properly propagated inside the test code.
Remove the restriction to test only the default ("") and "+hvf"
variant
and modify the documentation to state that any other variant is tested
the same way as the default one.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/domaincapstest.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 51fec0558f..96dc029af3 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -328,13 +328,11 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED,
if (STREQ(variant, "+hvf"))
hvf = true;
- else if (STRNEQ(variant, ""))
- return 0;
if (STREQ(arch, "x86_64")) {
/* For x86_64 based on the test variant we test:
*
- * '' (default) variant (KVM):
+ * '' (default) variant or any other non-listed variant:
* - KVM with default machine
* - KVM with Q35 machine
* '+hvf' variant:
@@ -362,7 +360,7 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED,
} else if (STREQ(arch, "aarch64")) {
/* For aarch64 based on the test variant we test:
*
- * '' (default) variant (KVM):
+ * '' (default) variant or any other non-listed variant:
* - KVM with default machine
* - KVM with virt machine
*
@@ -383,7 +381,8 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED,
ret = -1;
}
} else if (STRPREFIX(arch, "riscv") || STRPREFIX(arch,
"loongarch64")) {
- /* For riscv64 or loongarch64 we test two combinations:
+ /* For riscv64 or loongarch64 we test two combinations for any variant:
+ * ('+hvf' is not applicable for this case)
*
* - KVM with virt machine
* - TCG with virt machine
--
2.48.1