External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Rename virtTestCounterNext to virTestCounterNext.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemucommandutiltest.c
View File

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

6
tests/testutils.c
View File

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

2
tests/testutils.h
View File

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

2
tests/virbitmaptest.c
View File

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

2
tests/virfiletest.c
View File

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

2
tests/virstoragetest.c
View File

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