This function doesn't follow our convention of naming functions.
if (!(actualld = virCommandToString(ldcmd)))
goto out;
- if (virtTestCompareToFile(actualargv, cmdline) < 0)
+ if (virTestCompareToFile(actualargv, cmdline) < 0)
goto out;
- if (virtTestCompareToFile(actualld, ldcmdline) < 0)
+ if (virTestCompareToFile(actualld, ldcmdline) < 0)
goto out;
if (virFileExists(dmcmdline) || actualdm) {
- if (virtTestCompareToFile(actualdm, dmcmdline) < 0)
+ if (virTestCompareToFile(actualdm, dmcmdline) < 0)
goto out;
}
if (!(actual = virCPUDefFormat(cpu, NULL, updateCPU)))
goto cleanup;
- if (virtTestCompareToFile(actual, xml) < 0)
+ if (virTestCompareToFile(actual, xml) < 0)
goto cleanup;
ret = 0;
if (!(domCapsXML = virDomainCapsFormat(domCaps)))
goto cleanup;
- if (virtTestCompareToFile(domCapsXML, path) < 0)
+ if (virTestCompareToFile(domCapsXML, path) < 0)
goto cleanup;
ret = 0;
if (!(actualxml = virDomainDefFormat(vmdef, caps, 0)))
goto fail;
- if (virtTestCompareToFile(actualxml, xmlfile) < 0)
+ if (virTestCompareToFile(actualxml, xmlfile) < 0)
goto fail;
}
dctx, caps) < 0)
goto fail;
- if (virtTestCompareToFile(actual, outconf) < 0)
+ if (virTestCompareToFile(actual, outconf) < 0)
goto fail;
ret = 0;
virtTestClearCommandPath(actualargv);
virCommandSetDryRun(NULL, NULL, NULL);
- if (virtTestCompareToFile(actualargv, cmdline) < 0)
+ if (virTestCompareToFile(actualargv, cmdline) < 0)
goto cleanup;
ret = 0;
if (expectResult == TEST_COMPARE_NET_XML2XML_RESULT_FAIL_FORMAT)
goto cleanup;
- if (virtTestCompareToFile(actual, outxml) < 0) {
+ if (virTestCompareToFile(actual, outxml) < 0) {
result = TEST_COMPARE_NET_XML2XML_RESULT_FAIL_COMPARE;
goto cleanup;
}
goto fail;
if (!expectFailure) {
- if (virtTestCompareToFile(actual, outxml) < 0)
+ if (virTestCompareToFile(actual, outxml) < 0)
goto error;
}
nodeinfo.cores, nodeinfo.threads) < 0)
goto fail;
- if (virtTestCompareToFile(actualData, outputfile) < 0)
+ if (virTestCompareToFile(actualData, outputfile) < 0)
goto fail;
ret = 0;
goto fail;
}
- if (virtTestCompareToFile(actualData, outfile) < 0)
+ if (virTestCompareToFile(actualData, outfile) < 0)
goto fail;
ret = 0;
testRemoveCommonRules(actualargv);
- if (virtTestCompareToFile(actualargv, cmdline) < 0)
+ if (virTestCompareToFile(actualargv, cmdline) < 0)
goto cleanup;
ret = 0;
if (!(actual = virNWFilterDefFormat(dev)))
goto fail;
- if (virtTestCompareToFile(actual, outxml) < 0)
+ if (virTestCompareToFile(actual, outxml) < 0)
goto fail;
done:
if (!(actualxml = virDomainDefFormat(vmdef, driver.caps, 0)))
goto fail;
- if (virtTestCompareToFile(actualxml, xmlfile) < 0)
+ if (virTestCompareToFile(actualxml, xmlfile) < 0)
goto fail;
ret = 0;
if (!(actual = virQEMUCapsFormatCache(capsActual, 0, 0)))
goto cleanup;
- if (virtTestCompareToFile(actual, capsFile) < 0)
+ if (virTestCompareToFile(actual, capsFile) < 0)
goto cleanup;
ret = 0;
if (!capsXml)
goto cleanup;
- if (virtTestCompareToFile(capsXml, xmlFile) < 0)
+ if (virTestCompareToFile(capsXml, xmlFile) < 0)
goto cleanup;
ret = 0;
if (!(actual = cpuDataFormat(cpuData)))
goto cleanup;
- if (virtTestCompareToFile(actual, dataFile) < 0)
+ if (virTestCompareToFile(actual, dataFile) < 0)
goto cleanup;
ret = 0;
if (!(actualargv = virCommandToString(cmd)))
goto out;
- if (virtTestCompareToFile(actualargv, cmdline) < 0)
+ if (virTestCompareToFile(actualargv, cmdline) < 0)
goto out;
ret = 0;
if (!(actual = virSecretDefFormat(secret)))
goto fail;
- if (virtTestCompareToFile(actual, outxml) < 0)
+ if (virTestCompareToFile(actual, outxml) < 0)
goto fail;
ret = 0;
if (!(gotxml = virDomainDefFormat(def, caps, 0)))
goto fail;
- if (virtTestCompareToFile(gotxml, xml) < 0)
+ if (virTestCompareToFile(gotxml, xml) < 0)
goto fail;
ret = 0;
if (!(actual = virStoragePoolDefFormat(dev)))
goto fail;
- if (virtTestCompareToFile(actual, outxml) < 0)
+ if (virTestCompareToFile(actual, outxml) < 0)
goto fail;
ret = 0;
if (!(actualCmdline = virCommandToString(cmd)))
goto cleanup;
- if (virtTestCompareToFile(actualCmdline, cmdline) < 0)
+ if (virTestCompareToFile(actualCmdline, cmdline) < 0)
goto cleanup;
ret = 0;
if (!(actual = virStorageVolDefFormat(pool, dev)))
goto fail;
- if (virtTestCompareToFile(actual, outxml) < 0)
+ if (virTestCompareToFile(actual, outxml) < 0)
goto fail;
ret = 0;
if (!(sysfsActualData = virBufferCurrentContent(&buf)))
goto cleanup;
- if (virtTestCompareToFile(sysfsActualData, testdata->expected) < 0)
+ if (virTestCompareToFile(sysfsActualData, testdata->expected) < 0)
goto cleanup;
result = 0;
* @param filename: File to compare strcontent against
*/
int
-virtTestCompareToFile(const char *strcontent,
- const char *filename)
+virTestCompareToFile(const char *strcontent,
+ const char *filename)
{
int ret = -1;
char *filecontent = NULL;
goto out;
}
- if (virtTestCompareToFile(actual, outfile) < 0) {
+ if (virTestCompareToFile(actual, outfile) < 0) {
result = TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_COMPARE;
goto out;
}
const char *expect,
const char *actual,
size_t length);
-int virtTestCompareToFile(const char *strcontent,
- const char *filename);
+int virTestCompareToFile(const char *strcontent,
+ const char *filename);
unsigned int virTestGetDebug(void);
unsigned int virTestGetVerbose(void);
abs_srcdir, data->filename) < 0)
goto cleanup;
- if (virtTestCompareToFile(capsXML, path) < 0)
+ if (virTestCompareToFile(capsXML, path) < 0)
goto cleanup;
ret = 0;
goto cleanup;
actual = virBufferCurrentContent(&buf);
- if (virtTestCompareToFile(actual, parsed) < 0)
+ if (virTestCompareToFile(actual, parsed) < 0)
goto cleanup;
result = 0;
if (!(outjsonstr = virJSONValueToString(outjson, true)))
goto cleanup;
- if (virtTestCompareToFile(outjsonstr, outfile) < 0)
+ if (virTestCompareToFile(outjsonstr, outfile) < 0)
goto cleanup;
ret = 0;
VIR_DOMAIN_DEF_FORMAT_SECURE)))
goto cleanup;
- if (virtTestCompareToFile(formatted, xml) < 0)
+ if (virTestCompareToFile(formatted, xml) < 0)
goto cleanup;
ret = 0;
if (!(actualxml = virCapabilitiesFormatXML(caps)))
goto fail;
- if (virtTestCompareToFile(actualxml, xml) < 0)
+ if (virTestCompareToFile(actualxml, xml) < 0)
goto fail;
ret = 0;
goto fail;
gotxlcfgData[wrote] = '\0';
- if (virtTestCompareToFile(gotxlcfgData, xlcfg) < 0)
+ if (virTestCompareToFile(gotxlcfgData, xlcfg) < 0)
goto fail;
ret = 0;
VIR_DOMAIN_XML_SECURE)))
goto fail;
- if (virtTestCompareToFile(gotxml, xml) < 0)
+ if (virTestCompareToFile(gotxml, xml) < 0)
goto fail;
ret = 0;
goto fail;
gotxmcfgData[wrote] = '\0';
- if (virtTestCompareToFile(gotxmcfgData, xmcfg) < 0)
+ if (virTestCompareToFile(gotxmcfgData, xmcfg) < 0)
goto fail;
ret = 0;
if (!(gotxml = virDomainDefFormat(def, caps, VIR_DOMAIN_DEF_FORMAT_SECURE)))
goto fail;
- if (virtTestCompareToFile(gotxml, xml) < 0)
+ if (virTestCompareToFile(gotxml, xml) < 0)
goto fail;
ret = 0;
if (!(gotsexpr = xenFormatSxpr(NULL, def)))
goto fail;
- if (virtTestCompareToFile(gotsexpr, sexpr) < 0)
+ if (virTestCompareToFile(gotsexpr, sexpr) < 0)
goto fail;
ret = 0;
if (formatted == NULL)
goto failure;
- if (virtTestCompareToFile(formatted, vmx) < 0)
+ if (virTestCompareToFile(formatted, vmx) < 0)
goto failure;
result = 0;