[libvirt] [PATCH] 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. --- tests/bhyveargv2xmltest.c | 2 +- tests/bhyvexml2argvtest.c | 2 +- tests/bhyvexml2xmltest.c | 2 +- tests/commandtest.c | 2 +- tests/cputest.c | 2 +- tests/domaincapstest.c | 4 ++-- tests/domainconftest.c | 2 +- tests/domainsnapshotxml2xmltest.c | 2 +- tests/esxutilstest.c | 2 +- tests/eventtest.c | 2 +- tests/fchosttest.c | 2 +- tests/fdstreamtest.c | 2 +- tests/genericxml2xmltest.c | 2 +- tests/interfacexml2xmltest.c | 2 +- tests/jsontest.c | 2 +- tests/lxcconf2xmltest.c | 2 +- tests/lxcxml2xmltest.c | 2 +- tests/metadatatest.c | 2 +- tests/networkxml2conftest.c | 2 +- tests/networkxml2firewalltest.c | 2 +- tests/networkxml2xmltest.c | 2 +- tests/networkxml2xmlupdatetest.c | 2 +- tests/nodedevxml2xmltest.c | 2 +- tests/nsstest.c | 2 +- tests/nwfilterebiptablestest.c | 2 +- tests/nwfilterxml2firewalltest.c | 2 +- tests/nwfilterxml2xmltest.c | 2 +- tests/objecteventtest.c | 2 +- tests/openvzutilstest.c | 2 +- tests/qemuagenttest.c | 2 +- tests/qemuargv2xmltest.c | 2 +- tests/qemucapabilitiestest.c | 2 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucapsprobe.c | 2 +- tests/qemucommandutiltest.c | 2 +- tests/qemuhelptest.c | 2 +- tests/qemuhotplugtest.c | 2 +- tests/qemumemlocktest.c | 2 +- tests/qemumonitorjsontest.c | 2 +- tests/qemumonitortest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- tests/scsihosttest.c | 2 +- tests/seclabeltest.c | 2 +- tests/secretxml2xmltest.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 2 +- tests/sexpr2xmltest.c | 2 +- tests/sockettest.c | 2 +- tests/storagebackendsheepdogtest.c | 2 +- tests/storagepoolxml2xmltest.c | 2 +- tests/storagevolxml2argvtest.c | 2 +- tests/storagevolxml2xmltest.c | 2 +- tests/sysinfotest.c | 2 +- tests/testutils.c | 4 ++-- tests/testutils.h | 6 +++--- tests/utiltest.c | 2 +- tests/vboxsnapshotxmltest.c | 2 +- tests/viralloctest.c | 2 +- tests/viratomictest.c | 2 +- tests/virauthconfigtest.c | 2 +- tests/virbitmaptest.c | 2 +- tests/virbuftest.c | 2 +- tests/vircaps2xmltest.c | 2 +- tests/vircapstest.c | 2 +- tests/vircgrouptest.c | 2 +- tests/virconftest.c | 2 +- tests/vircryptotest.c | 2 +- tests/virdbustest.c | 2 +- tests/virdrivermoduletest.c | 2 +- tests/virendiantest.c | 2 +- tests/virfiletest.c | 2 +- tests/virfirewalltest.c | 4 ++-- tests/virhashtest.c | 2 +- tests/virhostcputest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/viridentitytest.c | 4 ++-- tests/viriscsitest.c | 2 +- tests/virkeycodetest.c | 2 +- tests/virkeyfiletest.c | 2 +- tests/virkmodtest.c | 2 +- tests/virlockspacetest.c | 2 +- tests/virlogtest.c | 2 +- tests/virmacmaptest.c | 2 +- tests/virnetdaemontest.c | 4 ++-- tests/virnetdevbandwidthtest.c | 2 +- tests/virnetdevtest.c | 2 +- tests/virnetmessagetest.c | 2 +- tests/virnetserverclienttest.c | 4 ++-- tests/virnetsockettest.c | 2 +- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 2 +- tests/virpcitest.c | 2 +- tests/virpolkittest.c | 2 +- tests/virportallocatortest.c | 2 +- tests/virrotatingfiletest.c | 2 +- tests/virschematest.c | 2 +- tests/virscsitest.c | 2 +- tests/virshtest.c | 2 +- tests/virstoragetest.c | 2 +- tests/virstringtest.c | 2 +- tests/virsystemdtest.c | 2 +- tests/virtimetest.c | 2 +- tests/virtypedparamtest.c | 2 +- tests/viruritest.c | 2 +- tests/virusbtest.c | 2 +- tests/vmwarevertest.c | 2 +- tests/vmx2xmltest.c | 2 +- tests/xencapstest.c | 2 +- tests/xlconfigtest.c | 2 +- tests/xmconfigtest.c | 2 +- tests/xml2sexprtest.c | 2 +- tests/xml2vmxtest.c | 2 +- 113 files changed, 121 insertions(+), 121 deletions(-) diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index e759e4f..08b2dfd 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -203,7 +203,7 @@ mymain(void) 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 diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 475e626..c8f8c68 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -235,7 +235,7 @@ mymain(void) 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 diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 3270fee..d591576 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -127,7 +127,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/commandtest.c b/tests/commandtest.c index bfbf6a4..80f10f8 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1305,6 +1305,6 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #endif /* !WIN32 */ diff --git a/tests/cputest.c b/tests/cputest.c index 98f6623..b76db42 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1012,4 +1012,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 02cadf8..f871197 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -567,9 +567,9 @@ mymain(void) } #if WITH_QEMU -VIRT_TEST_MAIN_PRELOAD(mymain, +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/domaincapsmock.so", abs_builddir "/.libs/qemucpumock.so") #else -VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/domaincapsmock.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/domaincapsmock.so") #endif diff --git a/tests/domainconftest.c b/tests/domainconftest.c index 196e358..6e75269 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -113,4 +113,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c index f5fec47..bb4d60f 100644 --- a/tests/domainsnapshotxml2xmltest.c +++ b/tests/domainsnapshotxml2xmltest.c @@ -230,7 +230,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index e9c8d31..787da51 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -263,7 +263,7 @@ mymain(void) return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/eventtest.c b/tests/eventtest.c index 03ab318..ea47fb0 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -528,4 +528,4 @@ mymain(void) return EXIT_SUCCESS; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/fchosttest.c b/tests/fchosttest.c index dc6b9af..ac4e929 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -380,4 +380,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so") diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 9c7d65b..4605845 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -342,4 +342,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 4881902..1cda18c 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -106,4 +106,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index 5e3525e..1a1a919 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -98,4 +98,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/jsontest.c b/tests/jsontest.c index 8e44f1a..b67f68c 100644 --- a/tests/jsontest.c +++ b/tests/jsontest.c @@ -451,4 +451,4 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index 779b590..d2f1c1d 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -127,7 +127,7 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 2f7f779..226a73d 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -105,7 +105,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/metadatatest.c b/tests/metadatatest.c index 55dc841..aed8e5a 100644 --- a/tests/metadatatest.c +++ b/tests/metadatatest.c @@ -308,4 +308,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index e2522fc..ab3c13a 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -151,4 +151,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index f3a501a..58a9516 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -147,7 +147,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else /* ! defined (__linux__) */ diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index effd85a..ea1a089 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -164,4 +164,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c index 7b01abc..1cbd811 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -363,4 +363,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 5e1ae17..f023d8a 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -105,4 +105,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/nsstest.c b/tests/nsstest.c index 915a8bc..ca5b475 100644 --- a/tests/nsstest.c +++ b/tests/nsstest.c @@ -198,7 +198,7 @@ mymain(void) 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 int main(void) diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 74f9ebd..4357133 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -569,4 +569,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index ba327d0..95ab46e 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -516,7 +516,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else /* ! defined (__linux__) */ diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 9beb8b6..d7457a0 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -152,4 +152,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index 5df6ff9..77a48a1 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -849,4 +849,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index c7336e7..8250277 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -155,7 +155,7 @@ mymain(void) return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 3be745e..41a0196 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -938,4 +938,4 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index a709c72..0b519a4 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -293,7 +293,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 2918ff4..bbb683e 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -186,4 +186,4 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 1b1ff7c..65ba270 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -189,4 +189,4 @@ mymain(void) 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") diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 561c5d7..662c703 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -48,7 +48,7 @@ main(int argc, char **argv) virThread thread; virQEMUCapsPtr caps; - VIRT_TEST_PRELOAD(abs_builddir "/.libs/qemucapsprobemock.so"); + VIR_TEST_PRELOAD(abs_builddir "/.libs/qemucapsprobemock.so"); if (argc != 2) { fprintf(stderr, "%s QEMU_binary\n", argv[0]); diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c index 1985983..b11dfbc 100644 --- a/tests/qemucommandutiltest.c +++ b/tests/qemucommandutiltest.c @@ -155,4 +155,4 @@ mymain(void) } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index c7355e3..e3751b2 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -431,7 +431,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index cdeb3f1..e835999 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -856,4 +856,4 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 48b0565..6cf17a4 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -129,7 +129,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 5d53609..a2911b0 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2941,4 +2941,4 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/qemumonitortest.c b/tests/qemumonitortest.c index 48f7ad2..cfb5514 100644 --- a/tests/qemumonitortest.c +++ b/tests/qemumonitortest.c @@ -191,7 +191,7 @@ mymain(void) return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 41461ea..85733d1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2511,7 +2511,7 @@ mymain(void) 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/virrandommock.so", abs_builddir "/.libs/qemucpumock.so") diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index eae999d..252f1ed 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1139,7 +1139,7 @@ mymain(void) 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 diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index 9efc2d2..6989e4f 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -303,7 +303,7 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else int main(void) diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c index be6e79f..4cda80c 100644 --- a/tests/seclabeltest.c +++ b/tests/seclabeltest.c @@ -43,4 +43,4 @@ mymain(void) return 0; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 714c709..19bd60a 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -85,4 +85,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 6d9c7ba..d4ef983 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -379,4 +379,4 @@ mymain(void) 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") diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index aba1e8e..63161b9 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -340,4 +340,4 @@ mymain(void) 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") diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index 9982fad..107509b 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -196,4 +196,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/sockettest.c b/tests/sockettest.c index 4d49b38..2db90bd 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -482,4 +482,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 1f6341f..75c3dd5 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -227,4 +227,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 355871c..2f44c3f 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -106,4 +106,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 24c3bac..9e43204 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -282,4 +282,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 18e8016..8521adf 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -120,4 +120,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 047e87b..2b32828 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -150,4 +150,4 @@ mymain(void) #undef TEST #undef TEST_FULL -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/testutils.c b/tests/testutils.c index f3feb6d..817fffa 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -904,11 +904,11 @@ int virTestMain(int argc, virLogOutputPtr *outputs = NULL; if (getenv("VIR_TEST_FILE_ACCESS")) - VIRT_TEST_PRELOAD(TEST_MOCK); + VIR_TEST_PRELOAD(TEST_MOCK); va_start(ap, func); while ((lib = va_arg(ap, const char *))) - VIRT_TEST_PRELOAD(lib); + VIR_TEST_PRELOAD(lib); va_end(ap); progname = last_component(argv[0]); diff --git a/tests/testutils.h b/tests/testutils.h index c16fe6c..c7f02e4 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -110,12 +110,12 @@ int virTestMain(int argc, ...); /* Setup, then call func() */ -# define VIRT_TEST_MAIN(func) \ +# define VIR_TEST_MAIN(func) \ int main(int argc, char **argv) { \ return virTestMain(argc, argv, func, NULL); \ } -# define VIRT_TEST_PRELOAD(lib) \ +# define VIR_TEST_PRELOAD(lib) \ do { \ const char *preload = getenv("LD_PRELOAD"); \ if (preload == NULL || strstr(preload, lib) == NULL) { \ @@ -135,7 +135,7 @@ int virTestMain(int argc, } \ } while (0) -# define VIRT_TEST_MAIN_PRELOAD(func, ...) \ +# define VIR_TEST_MAIN_PRELOAD(func, ...) \ int main(int argc, char **argv) { \ return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \ } diff --git a/tests/utiltest.c b/tests/utiltest.c index bd55d44..f80329b 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -284,4 +284,4 @@ mymain(void) return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index f84d199..1faac50 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -152,7 +152,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/viralloctest.c b/tests/viralloctest.c index 82c3311..27cbdcb 100644 --- a/tests/viralloctest.c +++ b/tests/viralloctest.c @@ -441,4 +441,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/viratomictest.c b/tests/viratomictest.c index 5185045..52f1715 100644 --- a/tests/viratomictest.c +++ b/tests/viratomictest.c @@ -175,4 +175,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index 6879a29..cf40ec4 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -138,4 +138,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index e007efc..e5305d0 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -714,4 +714,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virbuftest.c b/tests/virbuftest.c index 8ec6ce5..5905fee 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -495,4 +495,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index ffbe9a7..670bb8c 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -107,4 +107,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnumamock.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnumamock.so") diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 27d17bd..bc6362d 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -345,4 +345,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index f55ef74..8af5e2c 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -944,7 +944,7 @@ mymain(void) 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 int diff --git a/tests/virconftest.c b/tests/virconftest.c index 4fc7993..1f4b561 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -430,4 +430,4 @@ mymain(void) } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/vircryptotest.c b/tests/vircryptotest.c index 98bd059..b702b70 100644 --- a/tests/vircryptotest.c +++ b/tests/vircryptotest.c @@ -179,4 +179,4 @@ mymain(void) } /* 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") diff --git a/tests/virdbustest.c b/tests/virdbustest.c index 4e61cb3..3be9cf1 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -727,4 +727,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c index 13d51a8..cfb2dbd 100644 --- a/tests/virdrivermoduletest.c +++ b/tests/virdrivermoduletest.c @@ -107,4 +107,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virendiantest.c b/tests/virendiantest.c index f858e5c..263acc8 100644 --- a/tests/virendiantest.c +++ b/tests/virendiantest.c @@ -117,4 +117,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virfiletest.c b/tests/virfiletest.c index 05148e9..702a76a 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -189,4 +189,4 @@ mymain(void) return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 6f4fed5..0f703a6 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -1184,9 +1184,9 @@ mymain(void) } # if WITH_DBUS -VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so") # else -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) # endif #else /* ! defined (__linux__) */ diff --git a/tests/virhashtest.c b/tests/virhashtest.c index 40afd63..dbf07ae 100644 --- a/tests/virhashtest.c +++ b/tests/virhashtest.c @@ -639,4 +639,4 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 10e49ea..b415ec5 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -265,6 +265,6 @@ mymain(void) 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__ */ diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 889701c..b3beee9 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -633,7 +633,7 @@ mymain(void) 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 int main(void) diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index c7dc89d..dfa2947 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -243,7 +243,7 @@ mymain(void) } #if WITH_SELINUX -VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") #else -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #endif diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index ed66497..c95171a 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -217,5 +217,5 @@ mymain(void) return EXIT_SUCCESS; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #endif /* WIN32 */ diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index d092209..d4cb973 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -105,4 +105,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c index c4ce320..aec6924 100644 --- a/tests/virkeyfiletest.c +++ b/tests/virkeyfiletest.c @@ -120,4 +120,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c index b98edf9..47ca181 100644 --- a/tests/virkmodtest.c +++ b/tests/virkmodtest.c @@ -174,7 +174,7 @@ mymain(void) } -VIRT_TEST_MAIN(mymain); +VIR_TEST_MAIN(mymain); #else int main(void) diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c index cb0b889..75ad98a 100644 --- a/tests/virlockspacetest.c +++ b/tests/virlockspacetest.c @@ -371,4 +371,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virlogtest.c b/tests/virlogtest.c index b2c66f7..eb07fab 100644 --- a/tests/virlogtest.c +++ b/tests/virlogtest.c @@ -154,4 +154,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c index 4daa048..35e3127 100644 --- a/tests/virmacmaptest.c +++ b/tests/virmacmaptest.c @@ -234,4 +234,4 @@ mymain(void) 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") diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 91030f4..b86eea0 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -344,12 +344,12 @@ mymain(void) 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 static int mymain(void) { return EXIT_AM_SKIP; } -VIRT_TEST_MAIN(mymain); +VIR_TEST_MAIN(mymain); #endif diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 49283fe..a8f4ab1 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -167,4 +167,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevbandwidthmock.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevbandwidthmock.so") diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c index 7c8a03f..06e4a03 100644 --- a/tests/virnetdevtest.c +++ b/tests/virnetdevtest.c @@ -84,7 +84,7 @@ mymain(void) 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 int main(void) diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index 8189031..be7d019 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -547,4 +547,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c index 893db8a..c808701 100644 --- a/tests/virnetserverclienttest.c +++ b/tests/virnetserverclienttest.c @@ -149,12 +149,12 @@ mymain(void) 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 static int mymain(void) { return EXIT_AM_SKIP; } -VIRT_TEST_MAIN(mymain); +VIR_TEST_MAIN(mymain); #endif diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index cafdca9..c368861 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -597,4 +597,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 9f62413..a5583bd 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -633,7 +633,7 @@ mymain(void) 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 diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 24de212..47be5a0 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -487,7 +487,7 @@ mymain(void) 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 diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 9221c99..fba6189 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -456,7 +456,7 @@ mymain(void) 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 int main(void) diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c index 4495c7c..fe7666b 100644 --- a/tests/virpolkittest.c +++ b/tests/virpolkittest.c @@ -350,7 +350,7 @@ mymain(void) 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__ */ int diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 2c8bc24..ed9c4f2 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -174,7 +174,7 @@ mymain(void) 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) */ int main(void) diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c index 81e7b3f..89ceda8 100644 --- a/tests/virrotatingfiletest.c +++ b/tests/virrotatingfiletest.c @@ -741,4 +741,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virschematest.c b/tests/virschematest.c index faf66d6..c25102f 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -220,4 +220,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virscsitest.c b/tests/virscsitest.c index 4a0bbb8..dd1689c 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -247,4 +247,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virshtest.c b/tests/virshtest.c index 2f10224..16a584d 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -419,6 +419,6 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #endif /* WIN32 */ diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 984994d..70e24a1 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1512,4 +1512,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virstringtest.c b/tests/virstringtest.c index db1731f..96bc79f 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -961,4 +961,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 4cf4021..1564275 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -604,7 +604,7 @@ mymain(void) 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 /* ! (WITH_DBUS && __linux__) */ int diff --git a/tests/virtimetest.c b/tests/virtimetest.c index dd52177..93be91f 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -223,4 +223,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c index 97dd82a..fbacfa8 100644 --- a/tests/virtypedparamtest.c +++ b/tests/virtypedparamtest.c @@ -307,4 +307,4 @@ mymain(void) return EXIT_SUCCESS; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/viruritest.c b/tests/viruritest.c index 0d392ee..c297574 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -226,4 +226,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 7cddb89..1a2ad56 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -291,4 +291,4 @@ mymain(void) return EXIT_SUCCESS; } -VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virusbmock.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virusbmock.so") diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c index 9c17cc6..3dbe08b 100644 --- a/tests/vmwarevertest.c +++ b/tests/vmwarevertest.c @@ -94,7 +94,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 9b59fd5..4eedbac 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -295,7 +295,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else diff --git a/tests/xencapstest.c b/tests/xencapstest.c index 0e83d8a..7cbd43f 100644 --- a/tests/xencapstest.c +++ b/tests/xencapstest.c @@ -221,4 +221,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index e74e4d6..73702ac 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -299,4 +299,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 6399777..aa3845b 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -256,4 +256,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c index 0b95113..fddccf0 100644 --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -167,4 +167,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index b77be89..71c4cb9 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -304,7 +304,7 @@ mymain(void) return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIR_TEST_MAIN(mymain) #else -- 2.7.4