tests: Rename virtTestLogContentAndReset to virTestLogContentAndReset.

This function doesn't follow our convention of naming functions.

diff --git a/tests/cputest.c b/tests/cputest.c
index c0e26beef216c21ab5a154ccdcc9125047470075..010846cdaa608b83d3c019f033e14b0fbf07daec 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -476,13 +476,13 @@ cpuTestRun(const char *name, const struct data *data)
     if (virAsprintf(&label, "CPU %s(%s): %s", apis[data->api], data->arch, name) < 0)
         return -1;
 
-    tmp = virtTestLogContentAndReset();
+    tmp = virTestLogContentAndReset();
     VIR_FREE(tmp);
 
     if (virTestRun(label, cpuTest[data->api], data) < 0) {
         if (virTestGetDebug()) {
             char *log;
-            if ((log = virtTestLogContentAndReset()) &&
+            if ((log = virTestLogContentAndReset()) &&
                  strlen(log) > 0)
                 VIR_TEST_DEBUG("\n%s\n", log);
             VIR_FREE(log);

diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 3b5707fc5deb93c5f52c803f487a0691463a949c..c5fe776f68ad3ef192e35dc34dd0749690661430 100644 (file)
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -70,7 +70,7 @@ static int testCompareXMLToArgvFiles(const char *xmlfile,
         goto fail;
 
     if (!virTestOOMActive()) {
-        if ((log = virtTestLogContentAndReset()) == NULL)
+        if ((log = virTestLogContentAndReset()) == NULL)
             goto fail;
         if (flags & FLAG_EXPECT_WARNING) {
             if (*log) {

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 695d2acfd0772bef9111364542840c6b1934c5b4..f1f47ecab9e82b0f78ff5c837a09c7645e2418dc 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -310,7 +310,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
 
     virQEMUCapsFilterByMachineType(extraFlags, vm->def->os.machine);
 
-    log = virtTestLogContentAndReset();
+    log = virTestLogContentAndReset();
     VIR_FREE(log);
     virResetLastError();
 
@@ -353,7 +353,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
     }
     if (!virTestOOMActive()) {
         if (flags & FLAG_EXPECT_FAILURE) {
-            if ((log = virtTestLogContentAndReset()))
+            if ((log = virTestLogContentAndReset()))
                 VIR_TEST_DEBUG("Got expected error: \n%s", log);
         }
         virResetLastError();

diff --git a/tests/testutils.c b/tests/testutils.c
index 0f51ce9fe5b9818f1219cd3632e6ecaebecb7f15..5e794e8d1fee56ab9d824dc4c00bfb23974222a3 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -768,7 +768,7 @@ virtTestLogClose(void *data)
 /* Return a malloc'd string (possibly with strlen of 0) of all data
  * logged since the last call to this function, or NULL on failure.  */
 char *
-virtTestLogContentAndReset(void)
+virTestLogContentAndReset(void)
 {
     char *ret;
 

diff --git a/tests/testutils.h b/tests/testutils.h
index e4ed7d30eab18603f7992d1b6fad9b1c5cc9bdad..ac2bbce0d9a075e06d3795d28441807393d1b390 100644 (file)
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -93,7 +93,7 @@ unsigned int virTestGetRegenerate(void);
             fprintf(stderr, __VA_ARGS__);       \
     } while (0)
 
-char *virtTestLogContentAndReset(void);
+char *virTestLogContentAndReset(void);
 
 void virtTestQuiesceLibvirtErrors(bool always);