External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

domaincapstest: Propagate variant name into doTestQemuInternal

Browse Source 
Use it to format test file name as in other cases. Currently
domaincapstest will not run for any unknown variant. This patch is meant
to simplify the review of patches doing actual functional changes.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-08 15:27:47 +01:00
parent 2102a31bc2
commit bc48522cce
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/domaincapstest.c
View File

@ -246,6 +246,7 @@ static int
doTestQemuInternal(const char *version, doTestQemuInternal(const char *version,
const char *machine, const char *machine,
const char *arch, const char *arch,
const char *variant,
virDomainVirtType type, virDomainVirtType type,
void *opaque) void *opaque)
{ {
@ -284,8 +285,8 @@ doTestQemuInternal(const char *version,
else else
mach = g_strdup(""); mach = g_strdup("");
data.name = name = g_strdup_printf("qemu_%s%s%s.%s", data.name = name = g_strdup_printf("qemu_%s%s%s.%s%s",
version, typestr, mach, arch); version, typestr, mach, arch, variant);
if (STRPREFIX(version, "3.") || if (STRPREFIX(version, "3.") ||
STRPREFIX(version, "4.") || STRPREFIX(version, "4.") ||
@ -329,15 +330,15 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED,
* - KVM with Q35 machine * - KVM with Q35 machine
* - TCG with default machine * - TCG with default machine
*/ */
if (doTestQemuInternal(version, NULL, arch, if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0) VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1; ret = -1;
if (doTestQemuInternal(version, "q35", arch, if (doTestQemuInternal(version, "q35", arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0) VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1; ret = -1;
if (doTestQemuInternal(version, NULL, arch, if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_QEMU, opaque) < 0) VIR_DOMAIN_VIRT_QEMU, opaque) < 0)
ret = -1; ret = -1;
} else if (STREQ(arch, "aarch64")) { } else if (STREQ(arch, "aarch64")) {
@ -346,11 +347,11 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED,
* - KVM with default machine * - KVM with default machine
* - KVM with virt machine * - KVM with virt machine
*/ */
if (doTestQemuInternal(version, NULL, arch, if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0) VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1; ret = -1;
if (doTestQemuInternal(version, "virt", arch, if (doTestQemuInternal(version, "virt", arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0) VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1; ret = -1;
} else if (STRPREFIX(arch, "riscv")) { } else if (STRPREFIX(arch, "riscv")) {
@ -359,15 +360,15 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED,
* - KVM with virt machine * - KVM with virt machine
* - TCG with virt machine * - TCG with virt machine
*/ */
if (doTestQemuInternal(version, "virt", arch, if (doTestQemuInternal(version, "virt", arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0) VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1; ret = -1;
if (doTestQemuInternal(version, "virt", arch, if (doTestQemuInternal(version, "virt", arch, variant,
VIR_DOMAIN_VIRT_QEMU, opaque) < 0) VIR_DOMAIN_VIRT_QEMU, opaque) < 0)
ret = -1; ret = -1;
} else { } else {
if (doTestQemuInternal(version, NULL, arch, if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0) VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1; ret = -1;
} }