1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-13 00:01:55 +00:00

tests: Rename VIRT_TEST_* macros to VIR_TEST_*

We use the "vir" prefix pretty consistently in our
APIs, both external and internal, which made these
macros stood out.
This commit is contained in:
Andrea Bolognani 2017-03-29 16:45:42 +02:00
parent dff04e0af0
commit 4ceac4bf29
114 changed files with 122 additions and 122 deletions
tests
bhyveargv2xmltest.cbhyvexml2argvtest.cbhyvexml2xmltest.ccommandtest.ccputest.cdomaincapstest.cdomainconftest.cdomainsnapshotxml2xmltest.cesxutilstest.ceventtest.cfchosttest.cfdstreamtest.cgenericxml2xmltest.cinterfacexml2xmltest.cjsontest.clxcconf2xmltest.clxcxml2xmltest.cmetadatatest.cnetworkxml2conftest.cnetworkxml2firewalltest.cnetworkxml2xmltest.cnetworkxml2xmlupdatetest.cnodedevxml2xmltest.cnsstest.cnwfilterebiptablestest.cnwfilterxml2firewalltest.cnwfilterxml2xmltest.cobjecteventtest.copenvzutilstest.cqemuagenttest.cqemuargv2xmltest.cqemucapabilitiestest.cqemucaps2xmltest.cqemucapsprobe.cqemucommandutiltest.cqemuhelptest.cqemuhotplugtest.cqemumemlocktest.cqemumonitorjsontest.cqemumonitortest.cqemuxml2argvtest.cqemuxml2xmltest.cscsihosttest.cseclabeltest.csecretxml2xmltest.csecurityselinuxlabeltest.csecurityselinuxtest.csexpr2xmltest.csockettest.cstoragebackendsheepdogtest.cstoragepoolxml2xmltest.cstoragevolxml2argvtest.cstoragevolxml2xmltest.csysinfotest.ctestutils.ctestutils.hutiltest.cvboxsnapshotxmltest.cviralloctest.cviratomictest.cvirauthconfigtest.cvirbitmaptest.cvirbuftest.cvircaps2xmltest.cvircapstest.cvircgrouptest.cvirconftest.cvircryptotest.cvirdbustest.cvirdrivermoduletest.cvirendiantest.cvirfiletest.cvirfirewalltest.cvirhashtest.cvirhostcputest.cvirhostdevtest.cviridentitytest.cviriscsitest.cvirkeycodetest.cvirkeyfiletest.cvirkmodtest.cvirlockspacetest.cvirlogtest.cvirmacmaptest.cvirnetdaemontest.cvirnetdevbandwidthtest.cvirnetdevtest.cvirnetmessagetest.cvirnetserverclienttest.cvirnetsockettest.cvirnettlscontexttest.cvirnettlssessiontest.cvirpcitest.cvirpolkittest.cvirportallocatortest.cvirrotatingfiletest.cvirschematest.cvirscsitest.cvirshtest.cvirstoragetest.c

@ -203,7 +203,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyveargv2xmlmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyveargv2xmlmock.so")
#else #else

@ -235,7 +235,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyvexml2argvmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyvexml2argvmock.so")
#else #else

@ -127,7 +127,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -1305,6 +1305,6 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#endif /* !WIN32 */ #endif /* !WIN32 */

@ -1012,4 +1012,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -567,9 +567,9 @@ mymain(void)
} }
#if WITH_QEMU #if WITH_QEMU
VIRT_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MAIN_PRELOAD(mymain,
abs_builddir "/.libs/domaincapsmock.so", abs_builddir "/.libs/domaincapsmock.so",
abs_builddir "/.libs/qemucpumock.so") abs_builddir "/.libs/qemucpumock.so")
#else #else
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/domaincapsmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/domaincapsmock.so")
#endif #endif

@ -113,4 +113,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -230,7 +230,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -263,7 +263,7 @@ mymain(void)
return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -528,4 +528,4 @@ mymain(void)
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -380,4 +380,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")

@ -342,4 +342,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -106,4 +106,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -98,4 +98,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -451,4 +451,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -127,7 +127,7 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -105,7 +105,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -308,4 +308,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -151,4 +151,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -147,7 +147,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else /* ! defined (__linux__) */ #else /* ! defined (__linux__) */

@ -164,4 +164,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -363,4 +363,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -105,4 +105,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -198,7 +198,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/nssmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/nssmock.so")
#else #else
int int
main(void) main(void)

@ -569,4 +569,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -516,7 +516,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else /* ! defined (__linux__) */ #else /* ! defined (__linux__) */

@ -152,4 +152,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -849,4 +849,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -155,7 +155,7 @@ mymain(void)
return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -938,4 +938,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -293,7 +293,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -186,4 +186,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -189,4 +189,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemucaps2xmlmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemucaps2xmlmock.so")

@ -48,7 +48,7 @@ main(int argc, char **argv)
virThread thread; virThread thread;
virQEMUCapsPtr caps; virQEMUCapsPtr caps;
VIRT_TEST_PRELOAD(abs_builddir "/.libs/qemucapsprobemock.so"); VIR_TEST_PRELOAD(abs_builddir "/.libs/qemucapsprobemock.so");
if (argc != 2) { if (argc != 2) {
fprintf(stderr, "%s QEMU_binary\n", argv[0]); fprintf(stderr, "%s QEMU_binary\n", argv[0]);

@ -155,4 +155,4 @@ mymain(void)
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -431,7 +431,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -856,4 +856,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -129,7 +129,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -2941,4 +2941,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -191,7 +191,7 @@ mymain(void)
return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -2523,7 +2523,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MAIN_PRELOAD(mymain,
abs_builddir "/.libs/qemuxml2argvmock.so", abs_builddir "/.libs/qemuxml2argvmock.so",
abs_builddir "/.libs/virrandommock.so", abs_builddir "/.libs/virrandommock.so",
abs_builddir "/.libs/qemucpumock.so") abs_builddir "/.libs/qemucpumock.so")

@ -1139,7 +1139,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemuxml2xmlmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemuxml2xmlmock.so")
#else #else

@ -303,7 +303,7 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else
int int
main(void) main(void)

@ -43,4 +43,4 @@ mymain(void)
return 0; return 0;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -85,4 +85,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -379,4 +379,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")

@ -340,4 +340,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")

@ -196,4 +196,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -482,4 +482,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -227,4 +227,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -106,4 +106,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -282,4 +282,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -120,4 +120,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -150,4 +150,4 @@ mymain(void)
#undef TEST #undef TEST
#undef TEST_FULL #undef TEST_FULL
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -904,11 +904,11 @@ int virTestMain(int argc,
virLogOutputPtr *outputs = NULL; virLogOutputPtr *outputs = NULL;
if (getenv("VIR_TEST_FILE_ACCESS")) if (getenv("VIR_TEST_FILE_ACCESS"))
VIRT_TEST_PRELOAD(TEST_MOCK); VIR_TEST_PRELOAD(TEST_MOCK);
va_start(ap, func); va_start(ap, func);
while ((lib = va_arg(ap, const char *))) while ((lib = va_arg(ap, const char *)))
VIRT_TEST_PRELOAD(lib); VIR_TEST_PRELOAD(lib);
va_end(ap); va_end(ap);
progname = last_component(argv[0]); progname = last_component(argv[0]);

@ -110,12 +110,12 @@ int virTestMain(int argc,
...); ...);
/* Setup, then call func() */ /* Setup, then call func() */
# define VIRT_TEST_MAIN(func) \ # define VIR_TEST_MAIN(func) \
int main(int argc, char **argv) { \ int main(int argc, char **argv) { \
return virTestMain(argc, argv, func, NULL); \ return virTestMain(argc, argv, func, NULL); \
} }
# define VIRT_TEST_PRELOAD(lib) \ # define VIR_TEST_PRELOAD(lib) \
do { \ do { \
const char *preload = getenv("LD_PRELOAD"); \ const char *preload = getenv("LD_PRELOAD"); \
if (preload == NULL || strstr(preload, lib) == NULL) { \ if (preload == NULL || strstr(preload, lib) == NULL) { \
@ -135,7 +135,7 @@ int virTestMain(int argc,
} \ } \
} while (0) } while (0)
# define VIRT_TEST_MAIN_PRELOAD(func, ...) \ # define VIR_TEST_MAIN_PRELOAD(func, ...) \
int main(int argc, char **argv) { \ int main(int argc, char **argv) { \
return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \ return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \
} }

@ -284,4 +284,4 @@ mymain(void)
return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -152,7 +152,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#else #else

@ -441,4 +441,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -175,4 +175,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -138,4 +138,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -714,4 +714,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -495,4 +495,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -107,4 +107,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnumamock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnumamock.so")

@ -345,4 +345,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -944,7 +944,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/vircgroupmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/vircgroupmock.so")
#else #else
int int

@ -430,4 +430,4 @@ mymain(void)
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -179,4 +179,4 @@ mymain(void)
} }
/* Forces usage of not so random virRandomBytes */ /* Forces usage of not so random virRandomBytes */
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")

@ -727,4 +727,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -107,4 +107,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -117,4 +117,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -189,4 +189,4 @@ mymain(void)
return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS; return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -1184,9 +1184,9 @@ mymain(void)
} }
# if WITH_DBUS # if WITH_DBUS
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so")
# else # else
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
# endif # endif
#else /* ! defined (__linux__) */ #else /* ! defined (__linux__) */

@ -639,4 +639,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -265,6 +265,6 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virhostcpumock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virhostcpumock.so")
#endif /* __linux__ */ #endif /* __linux__ */

@ -633,7 +633,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virpcimock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virpcimock.so")
#else #else
int int
main(void) main(void)

@ -243,7 +243,7 @@ mymain(void)
} }
#if WITH_SELINUX #if WITH_SELINUX
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")
#else #else
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#endif #endif

@ -217,5 +217,5 @@ mymain(void)
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#endif /* WIN32 */ #endif /* WIN32 */

@ -105,4 +105,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -120,4 +120,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -174,7 +174,7 @@ mymain(void)
} }
VIRT_TEST_MAIN(mymain); VIR_TEST_MAIN(mymain);
#else #else
int int
main(void) main(void)

@ -371,4 +371,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -154,4 +154,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -234,4 +234,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmacmapmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmacmapmock.so")

@ -344,12 +344,12 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdaemonmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdaemonmock.so")
#else #else
static int static int
mymain(void) mymain(void)
{ {
return EXIT_AM_SKIP; return EXIT_AM_SKIP;
} }
VIRT_TEST_MAIN(mymain); VIR_TEST_MAIN(mymain);
#endif #endif

@ -167,4 +167,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevbandwidthmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevbandwidthmock.so")

@ -84,7 +84,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevmock.so")
#else #else
int int
main(void) main(void)

@ -547,4 +547,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -149,12 +149,12 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetserverclientmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetserverclientmock.so")
#else #else
static int static int
mymain(void) mymain(void)
{ {
return EXIT_AM_SKIP; return EXIT_AM_SKIP;
} }
VIRT_TEST_MAIN(mymain); VIR_TEST_MAIN(mymain);
#endif #endif

@ -597,4 +597,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -633,7 +633,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")
#else #else

@ -487,7 +487,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")
#else #else

@ -456,7 +456,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virpcimock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virpcimock.so")
#else #else
int int
main(void) main(void)

@ -350,7 +350,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so")
#else /* ! __ELF__ */ #else /* ! __ELF__ */
int int

@ -174,7 +174,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virportallocatormock.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virportallocatormock.so")
#else /* defined(__linux__) && defined(RTLD_NEXT) */ #else /* defined(__linux__) && defined(RTLD_NEXT) */
int int
main(void) main(void)

@ -741,4 +741,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -241,4 +241,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -247,4 +247,4 @@ mymain(void)
return ret; return ret;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

@ -419,6 +419,6 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#endif /* WIN32 */ #endif /* WIN32 */

@ -1512,4 +1512,4 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIRT_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)

Some files were not shown because too many files have changed in this diff Show More