External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-06 20:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: vmx: remove pointless labels

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Ján Tomko 2021-09-04 22:39:27 +02:00
parent 8e8603d24b
commit 583a561a4f
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/vmx2xmltest.c
View File

@ -68,7 +68,6 @@ testCapsInit(void)
static int
testCompareFiles(const char *vmx, const char *xml, bool should_fail_parse)
{
int ret = -1;
g_autofree char *vmxData = NULL;
g_autofree char *formatted = NULL;
g_autoptr(virDomainDef) def = NULL;
@ -79,31 +78,27 @@ testCompareFiles(const char *vmx, const char *xml, bool should_fail_parse)
def = virVMXParseConfig(&ctx, xmlopt, caps, vmxData);
if (should_fail_parse) {
if (!def)
ret = 0;
else
VIR_TEST_DEBUG("passed instead of expected failure");
goto cleanup;
return 0;
VIR_TEST_DEBUG("passed instead of expected failure");
return -1;
}
if (!def)
goto cleanup;
return -1;
if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
fprintf(stderr, "ABI stability check failed on %s", vmx);
goto cleanup;
return -1;
}
if (!(formatted = virDomainDefFormat(def, xmlopt,
VIR_DOMAIN_DEF_FORMAT_SECURE)))
goto cleanup;
return -1;
if (virTestCompareToFile(formatted, xml) < 0)
goto cleanup;
return -1;
ret = 0;
cleanup:
return ret;
return 0;
}
struct testInfo {

15
tests/xml2vmxtest.c
View File

@ -70,7 +70,6 @@ testCapsInit(void)
static int
testCompareFiles(const char *xml, const char *vmx, int virtualHW_version)
{
int result = -1;
g_autofree char *formatted = NULL;
g_autoptr(virDomainDef) def = NULL;
@ -78,25 +77,21 @@ testCompareFiles(const char *xml, const char *vmx, int virtualHW_version)
VIR_DOMAIN_DEF_PARSE_INACTIVE);
if (def == NULL)
goto failure;
return -1;
if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
fprintf(stderr, "ABI stability check failed on %s", xml);
goto failure;
return -1;
}
formatted = virVMXFormatConfig(&ctx, xmlopt, def, virtualHW_version);
if (formatted == NULL)
goto failure;
return -1;
if (virTestCompareToFile(formatted, vmx) < 0)
goto failure;
return -1;
result = 0;
failure:
return result;
return 0;
}
struct testInfo {