External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

domaincapstest: Give better names to test data files

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-05-10 20:29:17 +02:00
parent 8ba37e7a6e
commit 9ac9b039c4
9 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/domaincapsschemadata/domaincaps-basic.xml → tests/domaincapsschemadata/basic.xml
View File

0
tests/domaincapsschemadata/domaincaps-full.xml → tests/domaincapsschemadata/full.xml
View File

0
tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml → tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml
View File

0
tests/domaincapsschemadata/domaincaps-qemu_2.6.0-3.xml → tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml
View File

0
tests/domaincapsschemadata/domaincaps-qemu_2.6.0-4.xml → tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml
View File

0
tests/domaincapsschemadata/domaincaps-qemu_2.6.0-2.xml → tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
View File

0
tests/domaincapsschemadata/domaincaps-qemu_2.6.0-5.xml → tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml
View File

0
tests/domaincapsschemadata/domaincaps-qemu_2.6.0-1.xml → tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
View File

27
tests/domaincapstest.c
View File

@ -187,7 +187,7 @@ test_virDomainCapsFormat(const void *opaque)
char *domCapsXML = NULL; char *domCapsXML = NULL;
int ret = -1; int ret = -1;
if (virAsprintf(&path, "%s/domaincapsschemadata/domaincaps-%s.xml", if (virAsprintf(&path, "%s/domaincapsschemadata/%s.xml",
abs_srcdir, data->name) < 0) abs_srcdir, data->name) < 0)
goto cleanup; goto cleanup;
@ -256,8 +256,16 @@ mymain(void)
#define DO_TEST_QEMU(Name, CapsName, Emulator, Machine, Arch, Type) \ #define DO_TEST_QEMU(Name, CapsName, Emulator, Machine, Arch, Type) \
do { \ do { \
char *name = NULL; \
if (virAsprintf(&name, "qemu_%s%s%s.%s", \
Name, \
Machine ? "-" : "", Machine ? Machine : "", \
Arch) < 0) { \
ret = -1; \
break; \
} \
struct testData data = { \ struct testData data = { \
.name = Name, \ .name = name, \
.emulator = Emulator, \ .emulator = Emulator, \
.machine = Machine, \ .machine = Machine, \
.arch = Arch, \ .arch = Arch, \
@ -266,8 +274,9 @@ mymain(void)
.capsName = CapsName, \ .capsName = CapsName, \
.capsOpaque = cfg, \ .capsOpaque = cfg, \
}; \ }; \
if (virtTestRun(Name, test_virDomainCapsFormat, &data) < 0) \ if (virtTestRun(name, test_virDomainCapsFormat, &data) < 0) \
ret = -1; \ ret = -1; \
VIR_FREE(name); \
} while (0) } while (0)
DO_TEST("basic", "/bin/emulatorbin", "my-machine-type", DO_TEST("basic", "/bin/emulatorbin", "my-machine-type",
@ -277,27 +286,27 @@ mymain(void)
#if WITH_QEMU #if WITH_QEMU
DO_TEST_QEMU("qemu_1.6.50-1", "caps_1.6.50-1", DO_TEST_QEMU("1.6.50", "caps_1.6.50-1",
"/usr/bin/qemu-system-x86_64", NULL, "/usr/bin/qemu-system-x86_64", NULL,
"x86_64", VIR_DOMAIN_VIRT_KVM); "x86_64", VIR_DOMAIN_VIRT_KVM);
DO_TEST_QEMU("qemu_2.6.0-1", "caps_2.6.0-1", DO_TEST_QEMU("2.6.0", "caps_2.6.0-1",
"/usr/bin/qemu-system-x86_64", NULL, "/usr/bin/qemu-system-x86_64", NULL,
"x86_64", VIR_DOMAIN_VIRT_KVM); "x86_64", VIR_DOMAIN_VIRT_KVM);
DO_TEST_QEMU("qemu_2.6.0-2", "caps_2.6.0-1", DO_TEST_QEMU("2.6.0", "caps_2.6.0-1",
"/usr/bin/qemu-system-aarch64", NULL, "/usr/bin/qemu-system-aarch64", NULL,
"aarch64", VIR_DOMAIN_VIRT_KVM); "aarch64", VIR_DOMAIN_VIRT_KVM);
DO_TEST_QEMU("qemu_2.6.0-3", "caps_2.6.0-1", DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-1",
"/usr/bin/qemu-system-aarch64", "virt", "/usr/bin/qemu-system-aarch64", "virt",
"aarch64", VIR_DOMAIN_VIRT_KVM); "aarch64", VIR_DOMAIN_VIRT_KVM);
DO_TEST_QEMU("qemu_2.6.0-4", "caps_2.6.0-2", DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-2",
"/usr/bin/qemu-system-aarch64", "virt", "/usr/bin/qemu-system-aarch64", "virt",
"aarch64", VIR_DOMAIN_VIRT_KVM); "aarch64", VIR_DOMAIN_VIRT_KVM);
DO_TEST_QEMU("qemu_2.6.0-5", "caps_2.6.0-1", DO_TEST_QEMU("2.6.0", "caps_2.6.0-1",
"/usr/bin/qemu-system-ppc64", NULL, "/usr/bin/qemu-system-ppc64", NULL,
"ppc64le", VIR_DOMAIN_VIRT_KVM); "ppc64le", VIR_DOMAIN_VIRT_KVM);