8:08 a.m.
This function doesn't follow our convention of naming functions.
---
tests/domainsnapshotxml2xmltest.c | 2 +-
tests/interfacexml2xmltest.c | 2 +-
tests/nodedevxml2xmltest.c | 2 +-
tests/qemuhotplugtest.c | 2 +-
tests/testutils.c | 8 ++++----
tests/testutils.h | 36 ++++++++++++++++++------------------
tests/virfiletest.c | 2 +-
tests/viruritest.c | 6 +++---
8 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index 8e53b31..7428762 100644
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -114,7 +114,7 @@ testCompareXMLToXMLFiles(const char *inxml,
}
if (STRNEQ(outXmlData, actual)) {
- virtTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml);
+ virTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml);
goto cleanup;
}
diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c
index f817f00..084d47b 100644
--- a/tests/interfacexml2xmltest.c
+++ b/tests/interfacexml2xmltest.c
@@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *xml)
goto fail;
if (STRNEQ(xmlData, actual)) {
- virtTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
+ virTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
goto fail;
}
diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index 42dfa66..745995e 100644
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *xml)
goto fail;
if (STRNEQ(xmlData, actual)) {
- virtTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
+ virTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
goto fail;
}
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 68279d0..54a0a4a 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -192,7 +192,7 @@ testQemuHotplugCheckResult(virDomainObjPtr vm,
ret = 0;
} else {
if (!fail)
- virtTestDifferenceFull(stderr,
+ virTestDifferenceFull(stderr,
expected, expectedFile,
actual, NULL);
ret = -1;
diff --git a/tests/testutils.c b/tests/testutils.c
index 5de14ef..e0fc209 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -565,7 +565,7 @@ virtTestDifferenceFullInternal(FILE *stream,
* regenerate the expected file.
*/
int
-virtTestDifferenceFull(FILE *stream,
+virTestDifferenceFull(FILE *stream,
const char *expect,
const char *expectName,
const char *actual,
@@ -705,7 +705,7 @@ virTestCompareToFile(const char *strcontent,
if (STRNEQ_NULLABLE(fixedcontent ? fixedcontent : strcontent,
filecontent)) {
- virtTestDifferenceFull(stderr,
+ virTestDifferenceFull(stderr,
filecontent, filename,
strcontent, NULL);
goto failure;
@@ -758,7 +758,7 @@ virtTestLogOutput(virLogSourcePtr source ATTRIBUTE_UNUSED,
}
static void
-virtTestLogClose(void *data)
+virTestLogClose(void *data)
{
struct virtTestLogData *log = data;
@@ -892,7 +892,7 @@ int virtTestMain(int argc,
virLogSetFromEnv();
if (!getenv("LIBVIRT_DEBUG") && !virLogGetNbOutputs()) {
- if (virLogDefineOutput(virtTestLogOutput, virtTestLogClose, &testLog,
+ if (virLogDefineOutput(virtTestLogOutput, virTestLogClose, &testLog,
VIR_LOG_DEBUG, VIR_LOG_TO_STDERR, NULL, 0) < 0)
return EXIT_FAILURE;
}
diff --git a/tests/testutils.h b/tests/testutils.h
index c5e312f..d23e3ae 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -59,7 +59,7 @@ void virtTestClearCommandPath(char *cmdset);
int virTestDifference(FILE *stream,
const char *expect,
const char *actual);
-int virtTestDifferenceFull(FILE *stream,
+int virTestDifferenceFull(FILE *stream,
const char *expect,
const char *expectName,
const char *actual,
@@ -111,24 +111,24 @@ int virtTestMain(int argc,
return virtTestMain(argc, argv, func, NULL); \
}
-# define VIRT_TEST_PRELOAD(lib) \
- do { \
- const char *preload = getenv("LD_PRELOAD"); \
- if (preload == NULL || strstr(preload, lib) == NULL) { \
- char *newenv; \
- if (!virFileIsExecutable(lib)) { \
- perror(lib); \
- return EXIT_FAILURE; \
- } \
- if (!preload) { \
- newenv = (char *) lib; \
+# define VIRT_TEST_PRELOAD(lib) \
+ do { \
+ const char *preload = getenv("LD_PRELOAD"); \
+ if (preload == NULL || strstr(preload, lib) == NULL) { \
+ char *newenv; \
+ if (!virFileIsExecutable(lib)) { \
+ perror(lib); \
+ return EXIT_FAILURE; \
+ } \
+ if (!preload) { \
+ newenv = (char *) lib; \
} else if (virAsprintf(&newenv, "%s:%s", lib, preload) < 0)
{ \
- perror("virAsprintf"); \
- return EXIT_FAILURE; \
- } \
- setenv("LD_PRELOAD", newenv, 1); \
- execv(argv[0], argv); \
- } \
+ perror("virAsprintf"); \
+ return EXIT_FAILURE; \
+ } \
+ setenv("LD_PRELOAD", newenv, 1); \
+ execv(argv[0], argv); \
+ } \
} while (0)
# define VIRT_TEST_MAIN_PRELOAD(func, ...) \
diff --git a/tests/virfiletest.c b/tests/virfiletest.c
index b99a55c..a28fdba 100644
--- a/tests/virfiletest.c
+++ b/tests/virfiletest.c
@@ -160,7 +160,7 @@ mymain(void)
do { \
data1.path = PATH; \
data1.expect = EXPECT; \
- if (virTestRun(virtTestCounterNext(), testFileSanitizePath, \
+ if (virTestRun(virtTestCounterNext(), testFileSanitizePath, \
&data1) < 0) \
ret = -1; \
} while (0)
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 0d392ee..e857c09 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -156,9 +156,9 @@ mymain(void)
} while (0)
#define TEST_PARSE(uri, scheme, server, port, path, query, fragment, user, params) \
TEST_FULL(uri, NULL, scheme, server, port, path, query, fragment, user, params)
-#define TEST_PARAMS(query_in, query_out, params) \
- TEST_FULL("test://example.com/?" query_in, \
- *query_out ? "test://example.com/?" query_out : NULL, \
+#define TEST_PARAMS(query_in, query_out, params) \
+ TEST_FULL("test://example.com/?" query_in,
\
+ *query_out ? "test://example.com/?" query_out : NULL,
\
"test", "example.com", 0, "/", query_in,
NULL, NULL, params)
virURIParam params[] = {
--
2.5.5