[libvirt] [PATCH 08/19] tests: Rename virtTestCounterReset to virTestCounterReset.
This function doesn't follow our convention of naming functions.
---
tests/qemucommandutiltest.c | 2 +-
tests/testutils.c | 6 +++---
tests/testutils.h | 2 +-
tests/virbitmaptest.c | 2 +-
tests/virfiletest.c | 2 +-
tests/virstoragetest.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c
index 4eba3f4..1eb0b00 100644
--- a/tests/qemucommandutiltest.c
+++ b/tests/qemucommandutiltest.c
@@ -81,7 +81,7 @@ mymain(void)
return EXIT_AM_SKIP;
#endif
- virtTestCounterReset("testQemuCommandBuildObjectFromJSON");
+ virTestCounterReset("testQemuCommandBuildObjectFromJSON");
#define DO_TEST_COMMAND_OBJECT_FROM_JSON(PROPS, EXPECT) \
do { \
diff --git a/tests/testutils.c b/tests/testutils.c
index 592e0e0..cb4382a 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -1170,7 +1170,7 @@ static char *virtTestCounterPrefixEndOffset;
/**
- * virtTestCounterReset:
+ * virTestCounterReset:
* @prefix: name of the test group
*
* Resets the counter and sets up the test group name to use with
@@ -1180,7 +1180,7 @@ static char *virtTestCounterPrefixEndOffset;
* case names (including the number index) will be silently truncated.
*/
void
-virtTestCounterReset(const char *prefix)
+virTestCounterReset(const char *prefix)
{
virtTestCounter = 0;
@@ -1196,7 +1196,7 @@ virtTestCounterReset(const char *prefix)
* a way to do automagic test case numbering.
*
* Returns string consisting of test name prefix configured via
- * virtTestCounterReset() and a number that increments in every call of this
+ * virTestCounterReset() and a number that increments in every call of this
* function. This function is not thread safe.
*
* Note: The buffer for the assembled message is 128 bytes long. Longer test
diff --git a/tests/testutils.h b/tests/testutils.h
index b60c21f..2e3fada 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -97,7 +97,7 @@ char *virtTestLogContentAndReset(void);
void virtTestQuiesceLibvirtErrors(bool always);
-void virtTestCounterReset(const char *prefix);
+void virTestCounterReset(const char *prefix);
const char *virtTestCounterNext(void);
int virtTestMain(int argc,
diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index a59065b..eb2385f 100644
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -675,7 +675,7 @@ mymain(void)
if (virTestRun("test10", test10, NULL) < 0)
ret = -1;
- virtTestCounterReset("test11-");
+ virTestCounterReset("test11-");
TESTBINARYOP("0", "0", "0,^0", test11);
TESTBINARYOP("0-3", "0", "1-3", test11);
TESTBINARYOP("0-3", "0,3", "1-2", test11);
diff --git a/tests/virfiletest.c b/tests/virfiletest.c
index a28fdba..01029de 100644
--- a/tests/virfiletest.c
+++ b/tests/virfiletest.c
@@ -167,7 +167,7 @@ mymain(void)
#define DO_TEST_SANITIZE_PATH_SAME(PATH) DO_TEST_SANITIZE_PATH(PATH, PATH)
- virtTestCounterReset("testFileSanitizePath ");
+ virTestCounterReset("testFileSanitizePath ");
DO_TEST_SANITIZE_PATH("", "");
DO_TEST_SANITIZE_PATH("/", "/");
DO_TEST_SANITIZE_PATH("/path", "/path");
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 38445c8..3dd0aa7 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -708,7 +708,7 @@ mymain(void)
} while (0)
/* The actual tests, in several groups. */
- virtTestCounterReset("Storage backing chain ");
+ virTestCounterReset("Storage backing chain ");
/* Missing file */
TEST_ONE_CHAIN("bogus", VIR_STORAGE_FILE_RAW, EXP_FAIL);
--
2.5.5