From 9b8ff67fc09b7dda47906cc93df25feafebc6afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ry=C5=A1av=C3=BD?= Date: Thu, 26 May 2016 17:02:01 +0200 Subject: [PATCH] tests: Rename virtTestDifferenceFullNoRegenerate. This function doesn't follow our convention of naming functions. --- tests/qemuxml2xmltest.c | 6 +++--- tests/testutils.c | 16 ++++++++-------- tests/testutils.h | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b22b377de0..3b4bc17383 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -159,9 +159,9 @@ testCompareStatusXMLToXMLFiles(const void *opaque) if (STRNEQ(actual, expect)) { /* For status test we don't want to regenerate output to not * add the status data.*/ - virtTestDifferenceFullNoRegenerate(stderr, - expect, data->outActiveName, - actual, data->inName); + virTestDifferenceFullNoRegenerate(stderr, + expect, data->outActiveName, + actual, data->inName); goto cleanup; } diff --git a/tests/testutils.c b/tests/testutils.c index ae571b417f..225d61f159 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -588,11 +588,11 @@ virTestDifferenceFull(FILE *stream, * regenerate the expected file. */ int -virtTestDifferenceFullNoRegenerate(FILE *stream, - const char *expect, - const char *expectName, - const char *actual, - const char *actualName) +virTestDifferenceFullNoRegenerate(FILE *stream, + const char *expect, + const char *expectName, + const char *actual, + const char *actualName) { return virtTestDifferenceFullInternal(stream, expect, expectName, actual, actualName, false); @@ -611,9 +611,9 @@ virTestDifference(FILE *stream, const char *expect, const char *actual) { - return virtTestDifferenceFullNoRegenerate(stream, - expect, NULL, - actual, NULL); + return virTestDifferenceFullNoRegenerate(stream, + expect, NULL, + actual, NULL); } diff --git a/tests/testutils.h b/tests/testutils.h index 23a687d46a..1619b5db68 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -64,11 +64,11 @@ int virTestDifferenceFull(FILE *stream, const char *expectName, const char *actual, const char *actualName); -int virtTestDifferenceFullNoRegenerate(FILE *stream, - const char *expect, - const char *expectName, - const char *actual, - const char *actualName); +int virTestDifferenceFullNoRegenerate(FILE *stream, + const char *expect, + const char *expectName, + const char *actual, + const char *actualName); int virtTestDifferenceBin(FILE *stream, const char *expect, const char *actual,