tests: Rename virtTestMain to virTestMain.

This function doesn't follow our convention of naming functions.
This commit is contained in:
Tomáš Ryšavý 2016-05-26 17:02:08 +02:00 committed by John Ferlan
parent 6151dc2f55
commit 1a41ed5af5
2 changed files with 10 additions and 10 deletions

View File

@ -841,10 +841,10 @@ virTestSetEnvPath(void)
#define TEST_MOCK (abs_builddir "/.libs/virtestmock.so") #define TEST_MOCK (abs_builddir "/.libs/virtestmock.so")
int virtTestMain(int argc, int virTestMain(int argc,
char **argv, char **argv,
int (*func)(void), int (*func)(void),
...) ...)
{ {
const char *lib; const char *lib;
va_list ap; va_list ap;

View File

@ -100,15 +100,15 @@ void virTestQuiesceLibvirtErrors(bool always);
void virTestCounterReset(const char *prefix); void virTestCounterReset(const char *prefix);
const char *virTestCounterNext(void); const char *virTestCounterNext(void);
int virtTestMain(int argc, int virTestMain(int argc,
char **argv, char **argv,
int (*func)(void), int (*func)(void),
...); ...);
/* Setup, then call func() */ /* Setup, then call func() */
# define VIRT_TEST_MAIN(func) \ # define VIRT_TEST_MAIN(func) \
int main(int argc, char **argv) { \ int main(int argc, char **argv) { \
return virtTestMain(argc, argv, func, NULL); \ return virTestMain(argc, argv, func, NULL); \
} }
# define VIRT_TEST_PRELOAD(lib) \ # define VIRT_TEST_PRELOAD(lib) \
@ -133,7 +133,7 @@ int virtTestMain(int argc,
# define VIRT_TEST_MAIN_PRELOAD(func, ...) \ # define VIRT_TEST_MAIN_PRELOAD(func, ...) \
int main(int argc, char **argv) { \ int main(int argc, char **argv) { \
return virtTestMain(argc, argv, func, __VA_ARGS__, NULL); \ return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \
} }
virCapsPtr virTestGenericCapsInit(void); virCapsPtr virTestGenericCapsInit(void);