External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't clobber 'ret' in LXC XML test case

Browse Source 
The testCompareXMLToXMLHelper method clobbered the 'ret' variable
in several places leading to a failure to report OOM errors from
the test suite.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-09-25 09:35:29 +01:00
parent 93ac954094
commit 3debed1bbd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/lxcxml2xmltest.c
View File

@ -79,18 +79,23 @@ testCompareXMLToXMLHelper(const void *data)
goto cleanup; goto cleanup;
if (info->different) { if (info->different) {
ret = testCompareXMLToXMLFiles(xml_in, xml_out, false); if (testCompareXMLToXMLFiles(xml_in, xml_out, false) < 0)
goto cleanup;
} else { } else {
ret = testCompareXMLToXMLFiles(xml_in, xml_in, false); if (testCompareXMLToXMLFiles(xml_in, xml_in, false) < 0)
goto cleanup;
} }
if (!info->inactive_only) { if (!info->inactive_only) {
if (info->different) { if (info->different) {
ret = testCompareXMLToXMLFiles(xml_in, xml_out, true); if (testCompareXMLToXMLFiles(xml_in, xml_out, true) < 0)
goto cleanup;
} else { } else {
ret = testCompareXMLToXMLFiles(xml_in, xml_in, true); if (testCompareXMLToXMLFiles(xml_in, xml_in, true) < 0)
goto cleanup;
} }
} }
ret = 0;
cleanup: cleanup:
VIR_FREE(xml_in); VIR_FREE(xml_in);
VIR_FREE(xml_out); VIR_FREE(xml_out);