tests: Rename virtTestCounterNext to virTestCounterNext.

This function doesn't follow our convention of naming functions.
This commit is contained in:
Tomáš Ryšavý 2016-05-26 17:02:06 +02:00 committed by John Ferlan
parent 75f7309468
commit f5444742b0
6 changed files with 8 additions and 8 deletions

View File

@ -86,7 +86,7 @@ mymain(void)
do { \
data1.props = PROPS; \
data1.expectprops = EXPECT; \
if (virTestRun(virtTestCounterNext(), \
if (virTestRun(virTestCounterNext(), \
testQemuCommandBuildObjectFromJSON, \
&data1) < 0) \
ret = -1; \

View File

@ -1174,7 +1174,7 @@ static char *virtTestCounterPrefixEndOffset;
* @prefix: name of the test group
*
* Resets the counter and sets up the test group name to use with
* virtTestCounterNext(). This function is not thread safe.
* virTestCounterNext(). This function is not thread safe.
*
* Note: The buffer for the assembled message is 128 bytes long. Longer test
* case names (including the number index) will be silently truncated.
@ -1190,7 +1190,7 @@ virTestCounterReset(const char *prefix)
/**
* virtTestCounterNext:
* virTestCounterNext:
*
* This function is designed to ease test creation and reordering by adding
* a way to do automagic test case numbering.
@ -1203,7 +1203,7 @@ virTestCounterReset(const char *prefix)
* case names (including the number index) will be silently truncated.
*/
const char
*virtTestCounterNext(void)
*virTestCounterNext(void)
{
size_t len = ARRAY_CARDINALITY(virtTestCounterStr);

View File

@ -98,7 +98,7 @@ char *virTestLogContentAndReset(void);
void virTestQuiesceLibvirtErrors(bool always);
void virTestCounterReset(const char *prefix);
const char *virtTestCounterNext(void);
const char *virTestCounterNext(void);
int virtTestMain(int argc,
char **argv,

View File

@ -645,7 +645,7 @@ test12(const void *opaque ATTRIBUTE_UNUSED)
testBinaryOpData.a = A; \
testBinaryOpData.b = B; \
testBinaryOpData.res = RES; \
if (virTestRun(virtTestCounterNext(), FUNC, &testBinaryOpData) < 0) \
if (virTestRun(virTestCounterNext(), FUNC, &testBinaryOpData) < 0) \
ret = -1;
static int

View File

@ -160,7 +160,7 @@ mymain(void)
do { \
data1.path = PATH; \
data1.expect = EXPECT; \
if (virTestRun(virtTestCounterNext(), testFileSanitizePath, \
if (virTestRun(virTestCounterNext(), testFileSanitizePath, \
&data1) < 0) \
ret = -1; \
} while (0)

View File

@ -693,7 +693,7 @@ mymain(void)
for (i = 0; i < ARRAY_CARDINALITY(data.files); i++) \
if (data.files[i]) \
data.nfiles++; \
if (virTestRun(virtTestCounterNext(), \
if (virTestRun(virTestCounterNext(), \
testStorageChain, &data) < 0) \
ret = -1; \
} while (0)