mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-02 04:15:46 +00:00
Rename virtTestDifferenceFull to virTestDifferenceFull.
This function doesn't follow our convention of naming functions.
This commit is contained in:
parent
239caffb1d
commit
753edcb3a4
@ -114,7 +114,7 @@ testCompareXMLToXMLFiles(const char *inxml,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (STRNEQ(outXmlData, actual)) {
|
if (STRNEQ(outXmlData, actual)) {
|
||||||
virtTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml);
|
virTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml);
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *xml)
|
|||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
if (STRNEQ(xmlData, actual)) {
|
if (STRNEQ(xmlData, actual)) {
|
||||||
virtTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
|
virTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *xml)
|
|||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
if (STRNEQ(xmlData, actual)) {
|
if (STRNEQ(xmlData, actual)) {
|
||||||
virtTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
|
virTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -192,9 +192,9 @@ testQemuHotplugCheckResult(virDomainObjPtr vm,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
} else {
|
} else {
|
||||||
if (!fail)
|
if (!fail)
|
||||||
virtTestDifferenceFull(stderr,
|
virTestDifferenceFull(stderr,
|
||||||
expected, expectedFile,
|
expected, expectedFile,
|
||||||
actual, NULL);
|
actual, NULL);
|
||||||
ret = -1;
|
ret = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -565,11 +565,11 @@ virtTestDifferenceFullInternal(FILE *stream,
|
|||||||
* regenerate the expected file.
|
* regenerate the expected file.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
virtTestDifferenceFull(FILE *stream,
|
virTestDifferenceFull(FILE *stream,
|
||||||
const char *expect,
|
const char *expect,
|
||||||
const char *expectName,
|
const char *expectName,
|
||||||
const char *actual,
|
const char *actual,
|
||||||
const char *actualName)
|
const char *actualName)
|
||||||
{
|
{
|
||||||
return virtTestDifferenceFullInternal(stream, expect, expectName,
|
return virtTestDifferenceFullInternal(stream, expect, expectName,
|
||||||
actual, actualName, true);
|
actual, actualName, true);
|
||||||
@ -705,9 +705,9 @@ virTestCompareToFile(const char *strcontent,
|
|||||||
|
|
||||||
if (STRNEQ_NULLABLE(fixedcontent ? fixedcontent : strcontent,
|
if (STRNEQ_NULLABLE(fixedcontent ? fixedcontent : strcontent,
|
||||||
filecontent)) {
|
filecontent)) {
|
||||||
virtTestDifferenceFull(stderr,
|
virTestDifferenceFull(stderr,
|
||||||
filecontent, filename,
|
filecontent, filename,
|
||||||
strcontent, NULL);
|
strcontent, NULL);
|
||||||
goto failure;
|
goto failure;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,11 +59,11 @@ void virtTestClearCommandPath(char *cmdset);
|
|||||||
int virTestDifference(FILE *stream,
|
int virTestDifference(FILE *stream,
|
||||||
const char *expect,
|
const char *expect,
|
||||||
const char *actual);
|
const char *actual);
|
||||||
int virtTestDifferenceFull(FILE *stream,
|
int virTestDifferenceFull(FILE *stream,
|
||||||
const char *expect,
|
const char *expect,
|
||||||
const char *expectName,
|
const char *expectName,
|
||||||
const char *actual,
|
const char *actual,
|
||||||
const char *actualName);
|
const char *actualName);
|
||||||
int virtTestDifferenceFullNoRegenerate(FILE *stream,
|
int virtTestDifferenceFullNoRegenerate(FILE *stream,
|
||||||
const char *expect,
|
const char *expect,
|
||||||
const char *expectName,
|
const char *expectName,
|
||||||
|
Loading…
Reference in New Issue
Block a user