NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemucaps2xmltest: fix the test to correspond to new domain formatting

Browse Source 
Commit 2360fe5d updated formating of <domain> element but forgot to
update qemucaps2xmldata xml files.  In addition the test code was broken
too.  Update the xml files and return -1 if testCompareXMLToXML fails
together with indentation fix.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2015-03-24 15:22:16 +01:00
parent d75e23bbfb
commit 6d4269eca0
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/qemucaps2xmldata/all_1.6.0-1.xml
View File

@ -12,8 +12,7 @@
<arch name='i686'> <arch name='i686'>
<wordsize>32</wordsize> <wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-i386</emulator> <emulator>/usr/bin/qemu-system-i386</emulator>
<domain type='qemu'> <domain type='qemu'/>
</domain>
<domain type='kvm'> <domain type='kvm'>
<emulator>/usr/bin/qemu-system-i386</emulator> <emulator>/usr/bin/qemu-system-i386</emulator>
</domain> </domain>

3
tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml
View File

@ -12,8 +12,7 @@
<arch name='i686'> <arch name='i686'>
<wordsize>32</wordsize> <wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-i386</emulator> <emulator>/usr/bin/qemu-system-i386</emulator>
<domain type='qemu'> <domain type='qemu'/>
</domain>
<domain type='kvm'> <domain type='kvm'>
<emulator>/usr/bin/qemu-system-i386</emulator> <emulator>/usr/bin/qemu-system-i386</emulator>
</domain> </domain>

4
tests/qemucaps2xmltest.c
View File

@ -31,7 +31,7 @@
static int static int
testCompareXMLToXML(const char *inxmldata, const char *outxmldata) testCompareXMLToXML(const char *inxmldata, const char *outxmldata)
{ {
int ret = 1; int ret = -1;
if (STRNEQ(outxmldata, inxmldata)) { if (STRNEQ(outxmldata, inxmldata)) {
virtTestDifference(stderr, outxmldata, inxmldata); virtTestDifference(stderr, outxmldata, inxmldata);
@ -143,7 +143,7 @@ testQemuCapsXML(const void *opaque)
char *capsXml = NULL; char *capsXml = NULL;
virCapsPtr capsProvided = NULL; virCapsPtr capsProvided = NULL;
if (virAsprintf(&xmlFile, "%s/qemucaps2xmldata/%s.xml", if (virAsprintf(&xmlFile, "%s/qemucaps2xmldata/%s.xml",
abs_srcdir, data->base) < 0) abs_srcdir, data->base) < 0)
goto cleanup; goto cleanup;