]> xenbits.xensource.com Git - libvirt.git/commitdiff
tests: Rename virtTestMain to virTestMain. osstest/frozen/xen-4.7-testing
authorTomáš Ryšavý <tom.rysavy.0@gmail.com>
Thu, 26 May 2016 15:02:08 +0000 (17:02 +0200)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 8 Jun 2016 15:23:13 +0000 (11:23 -0400)
This function doesn't follow our convention of naming functions.

tests/testutils.c
tests/testutils.h

index a281fbb8d85a202ca7917c8dc0f5a5b532a44bc8..e2dd2fec39c45fea03f071a39b4cf6ae8805ca0b 100644 (file)
@@ -841,10 +841,10 @@ virTestSetEnvPath(void)
 
 #define TEST_MOCK (abs_builddir "/.libs/virtestmock.so")
 
-int virtTestMain(int argc,
-                 char **argv,
-                 int (*func)(void),
-                 ...)
+int virTestMain(int argc,
+                char **argv,
+                int (*func)(void),
+                ...)
 {
     const char *lib;
     va_list ap;
index 352f80ab9a14de3f49c048bb64d85558f9523b2f..e3881e895ff4b8339e7b05cd8449085dca72b8c1 100644 (file)
@@ -100,15 +100,15 @@ void virTestQuiesceLibvirtErrors(bool always);
 void virTestCounterReset(const char *prefix);
 const char *virTestCounterNext(void);
 
-int virtTestMain(int argc,
-                 char **argv,
-                 int (*func)(void),
-                 ...);
+int virTestMain(int argc,
+                char **argv,
+                int (*func)(void),
+                ...);
 
 /* Setup, then call func() */
 # define VIRT_TEST_MAIN(func)                           \
     int main(int argc, char **argv) {                   \
-        return virtTestMain(argc, argv, func, NULL);    \
+        return virTestMain(argc, argv, func, NULL);     \
     }
 
 # define VIRT_TEST_PRELOAD(lib)                                         \
@@ -133,7 +133,7 @@ int virtTestMain(int argc,
 
 # define VIRT_TEST_MAIN_PRELOAD(func, ...)                              \
     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);