提交 753edcb3 编写于 作者: T Tomáš Ryšavý 提交者: John Ferlan

Rename virtTestDifferenceFull to virTestDifferenceFull.

This function doesn't follow our convention of naming functions.
上级 239caffb
...@@ -114,7 +114,7 @@ testCompareXMLToXMLFiles(const char *inxml, ...@@ -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) ...@@ -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) ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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); ...@@ -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,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册