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.

diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c
index e759e4fa30187fc1ef8ef4ff5220a96bb79789ed..08b2dfd4be1c464c09be8e65acf85cb9aabb211d 100644 (file)
--- 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 475e62666961aca75dd8d655c56fa1364bbba0b4..c8f8c685a9b32befa6ed67a326e887b088036796 100644 (file)
--- 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 3270fee3ce00d75916e033dd348e7a76bb948eec..d591576ca79781b01ca77f2d49c3c499182f9328 100644 (file)
--- 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 bfbf6a42f611e04743d6d1e06c9ba36aeec3d367..80f10f88fc397ec407b9c391a138ab6391568112 100644 (file)
--- 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 3d3e43f1674af48646166ed709fd8f9045e6564d..a20e418e4da8dab22726b491e6418b2ef4c0fa6f 100644 (file)
--- 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 02cadf8ea32757d7b031afcca1d643a3aee09acf..f871197c25fe6ad177750dca119a42de90679022 100644 (file)
--- 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 196e358e2e035f14c1ab72761eba19836d31c1a7..6e7526907aa57dabcc59dd99123f34d1e6158cfa 100644 (file)
--- 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 f5fec47520ff0eafb49c0cbe02d3756e48f9b9ca..bb4d60f7daede7d4bdb3a3ccb15e976066aa401a 100644 (file)
--- 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 e9c8d31af74b0c5e8598016de7fbaf88c2b1a19a..787da5169e2ed93c41fc679013da390b7abbc01a 100644 (file)
--- 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 03ab3184726d49058567dc191e0212360ed3b968..ea47fb0cba37274ba4b060c0481d4053a882790b 100644 (file)
--- 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 dc6b9af9884e7e3b5173f503d454d1887558498a..ac4e92910d06e6c2f2a5c51f8df493298db69af3 100644 (file)
--- 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 9c7d65bef6cc39d2be969708ea8789830e5b4aa0..4605845d3d3d8d03c17d55cdbe919fd6513f0d29 100644 (file)
--- 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 488190270fcbb11d89d5df12226b72abfaa89bc7..1cda18cd9389e4ce7812c105f91a23d36a6d3aca 100644 (file)
--- 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 5e3525e4400710c546739a69789af0267991a205..1a1a919dfa6f4ed5c48181628af4de13d6f7b1be 100644 (file)
--- 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 8e44f1ae708dde67aa97f5f3b4d5c888d11bcb4a..b67f68ccb274ab36f9bee35d93b69d8a6f560769 100644 (file)
--- 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 779b59061280464ff52b526fd382c691f41de6bb..d2f1c1d45a4b72b213c449cb55cd85e57ff6ffe6 100644 (file)
--- 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 2f7f77973472c506afbd7ae84ed68098e0c337bd..226a73d274f6d8a1b1e5bd9d15e6dbbcc8114089 100644 (file)
--- 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 55dc841254bcfda0742d22580723bf4acac172b4..aed8e5a87009d879aef140b66cfc91846f950388 100644 (file)
--- 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 e2522fccd7666acf8159455d5df4dd0a0e4c7c2e..ab3c13aa0a54db8bdbf8eece42b51f833e2ba8dd 100644 (file)
--- 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 f3a501a0b0f7467c671c7b8884e9f7bd95eac20c..58a9516686c1d65e1373a59e77b6c99f94710cd4 100644 (file)
--- 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 effd85ad054bed5d4b33127d303a286edb41b68a..ea1a08988ee45c6bee4993606a1184c35358ae58 100644 (file)
--- 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 7b01abc6f9b12e189e5b3974798e5fd80fb19d2e..1cbd811a2f7f202145e23b72864efce82c010d1f 100644 (file)
--- 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 5e1ae170c37839711302870d11cebf24d3045fba..f023d8a1336e2e86b5511b837442f27d45730306 100644 (file)
--- 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 915a8bceb57dd24805bdf1d9f81270fd2948e046..ca5b47527bfb1e00f318f6d6631ec620b4c5a55a 100644 (file)
--- 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 74f9ebd366a6594722e834530bb440e0377570bd..4357133783627db3d6c839b38d171bc61429dad0 100644 (file)
--- 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 ba327d019580ea7866308a203cdc9daf43393766..95ab46e22ec72bacbc4577c342bef2ba1c746144 100644 (file)
--- 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 9beb8b663af938bbec76a33f7e1adc91d84b6335..d7457a0687adde117bf4e789bde17436dc52d495 100644 (file)
--- 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 5df6ff91e78cc5a66338b45bbee64130705512df..77a48a14957a1f3317fe5be825be868f028e0e03 100644 (file)
--- 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 c7336e7e8742b22e05f161d850fae843abbdcd05..8250277caf93ac1a2723c4443f322d8ceaf9277c 100644 (file)
--- 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 3be745e7c25b94b7b7f31a6e434346f32725d589..41a0196c46abc0153b3d3a7a074a6ea5c83432be 100644 (file)
--- 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 a709c72cf1bb1cd683054a9a4f1ff80dc0c9102e..0b519a460b25e8c9f00f902dadbf434dc4dc8b86 100644 (file)
--- 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 2918ff46954433d6b3b498355f2f5b28ca96b31f..bbb683eb83efbe9fc695652539e90078931d8db1 100644 (file)
--- 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 1b1ff7c1e6d1d042ae64f30a3d86d29af57b36fe..65ba27048f1ed98b383ac5ee9fcd6f3cf0aeac88 100644 (file)
--- 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 561c5d7c146e36f1eca8a44474088a0dd0d10af7..662c7036edd42670a2ebd7b200b7b4e8dc02630d 100644 (file)
--- 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 1985983dac1a722347166b0e885c5edde8709c8b..b11dfbc73011634018e9291a8cce0bc94886323f 100644 (file)
--- 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 c7355e3d53e8d1a315c59a036a48b3bb5cb787f9..e3751b2d035eb2693a72625add1aa67fb934300b 100644 (file)
--- 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 cdeb3f1bfbf9a13d491ba37dcea2bcd2524526d9..e835999c722c83469ec9b1b11fff8b1f83825cc6 100644 (file)
--- 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 48b0565d68b529c4d0965df44a898c7b24044fa7..6cf17a4b4a478ecb77731e74717371dda6143642 100644 (file)
--- 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 5d536093493e82cba182788fa04fc6c8b2454bec..a2911b0f404fbf317b1c6ce5d6ce03bd793ac813 100644 (file)
--- 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 48f7ad2100bb18b24a97004242b90bfaf363b9b8..cfb55143e18c2bbbd1ce61a87b97f438ae6fcf08 100644 (file)
--- 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 cfd6dcd55e0471ea53fb78ef6d323dfe3d3be823..0b26cd5c7c48803f787f171da644bd9e69893e1b 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2523,7 +2523,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 eae999dd632a9629ed4a94763be041a1f583f376..252f1ed5f2a86c6adccbfd5f2fbbb9d4b9f19941 100644 (file)
--- 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 9efc2d250f1e2f6d6d1a20c2c2ca4e10fd3e6864..6989e4fc4a264b966c408b39b655b56b26d3bf44 100644 (file)
--- 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 be6e79ff6af9d28c4a709a6e03c7066132293ca5..4cda80cec2665f5231268adc081f46c08bea0886 100644 (file)
--- 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 714c709090a4cd87411df6df574dfa6449fa9150..19bd60a91189b9007fee16bd3026614abbaededd 100644 (file)
--- 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 6d9c7bada9d4816ed0a00a7d544604e8e982b200..d4ef9831adda379433875582dfcb6fe3e0df1780 100644 (file)
--- 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 aba1e8e34e718727833ef80dea71694c12edba23..63161b9b3b92a677076d35c448ec5a241e66f491 100644 (file)
--- 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 9982fad9f714146c1ae55b81335dbf07ed1a6cb1..107509b31a7fd62ba6a0b8cb360d31797ca7c1f1 100644 (file)
--- 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 4d49b38aa1cfdf87cb827952a8acd799c553e7a7..2db90bd02e8e4f6904f587dd0c78e0cbb84f7277 100644 (file)
--- 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 1f6341f8adf2d7f87d24f25980fd3fa3f33dbef3..75c3dd5ddaa9bec2864b9b83e9565f754c60a455 100644 (file)
--- 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 355871c618d52a8178e2b19b619d028d14821b5b..2f44c3f342366ef4dc65074f56b45eed64e8a844 100644 (file)
--- 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 24c3bac20d399e316ad4171376d0390d48c79438..9e432045fefa5f64ff5a4958acb2f88f0c8c629f 100644 (file)
--- 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 18e8016cb3c8ddbd167d44548549145f641c3bed..8521adf9660e6c6db83ace9631c294d09aaadbe2 100644 (file)
--- 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 047e87b7a4ed3e8ca2e4d3da7db7609a5c55eaaf..2b3282819926d0f9eb64ccac8667f97550dbefdc 100644 (file)
--- 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 f3feb6d3f94e88651f1ca04714098d8ac68457f4..817fffa041ce1b259b2b129d30c85a7986cc7cd0 100644 (file)
--- 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 c16fe6cc1eed368df194592b5c1253bade973188..c7f02e468f08a1bedeb2bc35cfbca7b6791e1c98 100644 (file)
--- 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 bd55d447b177ed9ec9da380aa10b860842033090..f80329b30e9e272c0cc65bf98e14fa8795800fdb 100644 (file)
--- 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 f84d199e6077c35589640de4c42be70f3309fa02..1faac506525f3de8a39e5be4dbf6263ac8ceabf9 100644 (file)
--- 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 82c33114f96acace1bd9508f46459e1cf7347d27..27cbdcbbe46fa8164a2fe6e1e877946a8894a4c2 100644 (file)
--- 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 518504538637559eb45a9ede0e0fb78b903020f7..52f17154e9d96567df1334c7540a010b04aae5a4 100644 (file)
--- 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 6879a29d9dc4addef8cc35cba8a78237bb57b043..cf40ec4659f04e09f24f9bc037fd3dc3865d733c 100644 (file)
--- 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 e007efc28be45ab0942291f7daa657fe63cc7cb8..e5305d0223158f6a334321bde128af90424bb23e 100644 (file)
--- 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 8ec6ce51ed3216f97ae7841bca02db4a5e70c64a..5905fee7d41d28697abdc6f3713155c02f812c25 100644 (file)
--- 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 ffbe9a783811f1a1f30769733c89d54caf0a1a5d..670bb8c375b35caf8832c00222b6d5f0b757ea5a 100644 (file)
--- 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 27d17bdde9b7860a05655919316afa6c5c83dd1a..bc6362dc4c96a0b22bcd558f1d6bb8b2db573023 100644 (file)
--- 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 f55ef74a1bf79be6970718e738995a603414fd22..8af5e2c8ef426fd0c2cb159bf71ff6b1d376a903 100644 (file)
--- 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 4fc7993ddc2b04bef798480bce0618cd6f8d1e0a..1f4b561bb6e639195a2fdc18f12c7f7d425eb667 100644 (file)
--- 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 98bd059e66c762b586736484b1f17843fe3a4466..b702b70b5e13fb694ee1a589d63ad949ebd0fcc5 100644 (file)
--- 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 4e61cb34643deaf0762c33837d5881466a43582d..3be9cf17eddaf74fba8adf2263a595217c8d1fdb 100644 (file)
--- 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 13d51a8e9a060721ca0a67aaa6cd5d2cc48f69a2..cfb2dbdb4d92acc643d9944bfee056aaa9541a8a 100644 (file)
--- 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 f858e5cb754341b38756a61e3447810043e53e9c..263acc8e52baa7a75986bdcb7dcb298f5bfbea9c 100644 (file)
--- 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 05148e94ad048ca47dec8333a0b13f3e3735c360..702a76a501c96fcb27c55b1e0f51b1ace8f678d0 100644 (file)
--- 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 6f4fed5ce312099edab1e03f7c3c3e5b461147a0..0f703a6bdc9b7f9723d1b2b9deabd2af5c926192 100644 (file)
--- 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 40afd63e71d5cd46814f55b44b0f067f114fdeff..dbf07ae7f7268a8e26f545785e594575a10024a1 100644 (file)
--- 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 10e49ea4f0a4008a3050e8957de7014294086705..b415ec5f1b08ad5b438664067cf621e561ccbe43 100644 (file)
--- 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 889701cf636f56f916841d5c16e6800f28e3431a..b3beee99f2c07f957de2c6b4dc229dc46981feb8 100644 (file)
--- 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 c7dc89da2ddd5418d13283d64a94062c6a239465..dfa29478e01f15c1975be96305395cc78ced27f0 100644 (file)
--- 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 ed66497a00a47a189f08015cf4791e3675a58007..c95171aa3154277eae8d77c7b7ae0363191e7f23 100644 (file)
--- 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 d092209d44ff43bcc4603e9ab5a72ec6b8f9f77c..d4cb973dbe25585591cec0d8778830cb74275184 100644 (file)
--- 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 c4ce320dc7282a3bc2c388a94965b9a8e554e2a7..aec692468f42e962ecc9128aee19c49646bbae9e 100644 (file)
--- 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 b98edf9b0f9631ad79e83aa10c384d6be503ac2a..47ca181fae0f785495102c551a180ffe64527e0c 100644 (file)
--- 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 cb0b88913d8dd3c1bf154b6830c8c8cb2c9e8a67..75ad98a02cc0903fc739e40c1e862d83718f831e 100644 (file)
--- 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 b2c66f7a0d163dffa05a59bec1075c63b7d7b8b4..eb07fab902e6fe9cb92caf1ece599af74605f6a3 100644 (file)
--- 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 4daa0488483937cf6fd5db9d9084ae80a30e9506..35e3127717501d2e325b16589ca0e3316f342150 100644 (file)
--- 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 91030f42c0e00b4724f3acf56de35f3437faff78..b86eea0ae318a496815cd9e41cbb7760d61d5a19 100644 (file)
--- 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 49283fec4ae051a97306495b9ae6c97036e60f44..a8f4ab1966590b16322dbfb607656bdb21f23660 100644 (file)
--- 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 7c8a03f9b77e4009ec417d3fac251b5e06547a04..06e4a03a9bc2e3fba4b80d679a82d81c8ecfd70a 100644 (file)
--- 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 8189031f54f2887a5bba7a3bc429a3223c94f662..be7d019c310a50fac62e35288328012fea48ffaa 100644 (file)
--- 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 893db8a7598f74de621dfcb960cdb625d1dc6413..c80870141c9836e3488b6145799fb058d24dbc21 100644 (file)
--- 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 cafdca997de84dd280e614caa6352da2f5814e22..c36886137a035185055c709acea37a0016fb7a8e 100644 (file)
--- 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 9f62413eed503db4f495864b75dbcefc55125ec0..a5583bdfc261535004a882d12423e5dd8a7e7740 100644 (file)
--- 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 24de212d9b58af3b9597792ade64050d35ff2c7d..47be5a024346e24893e96fd315bcd4654a9dc2fb 100644 (file)
--- 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 9221c991f4e0479121f4d743b75a6ba1fa9ab393..fba6189767502e60e17aa4ed101efceecbe01d2d 100644 (file)
--- 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 4495c7c8880a4d810231834226518719e5035ac8..fe7666bd35ba7be0d15e387aab74fb54b5d5c7a5 100644 (file)
--- 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 2c8bc24406a6045b09a532be73658158d7b883b1..ed9c4f285438cf5b1152ba3a2f5f927262adbbf2 100644 (file)
--- 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 81e7b3ff4c38750e72cf51c51fab242fe0c3b460..89ceda8e49bdea4abdfa32056fed7fd111710152 100644 (file)
--- 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 4f194804afb302ddce80c1d57b708f6456cdb75d..1f990f7cd5bb464a17f46c5e9d77b68ea374b846 100644 (file)
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -241,4 +241,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 4a0bbb80f9f559ca2e56cce6facd4a4cb341bc0c..dd1689c7f1cef6852e47b57304e93f8aea842fc8 100644 (file)
--- 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 2f1022416a8a0882ab1e7b6cd02ffbae72d709c9..16a584d74a81a5a8963538f11e7fc16dd1eb5e2b 100644 (file)
--- 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 984994d8e7f79292b9fd4828ea89b9863d4046ee..70e24a1b70db33971dc53b9d43d2e4b4987932f9 100644 (file)
--- 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/virstorageutiltest.c b/tests/virstorageutiltest.c
index f82d5174f6fdeb704d138bb9b1ddf6924e70b6d1..cc860a3056256a28abe3bd15e511b8130ee81116 100644 (file)
--- a/tests/virstorageutiltest.c
+++ b/tests/virstorageutiltest.c
@@ -111,4 +111,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 db1731f96aacde1d54fd25559ef84a6391264d24..96bc79f8325cc34032d89d43f376bad2d36eca42 100644 (file)
--- 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 4cf40213080b7dfd981b155a5a95717e30598f1b..15642759e94fc1d7c36fd7fa63ba1688a59aee01 100644 (file)
--- 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 dd521779ed9bfbbabf747ea2f22e917dbeb49536..93be91f62d4d736af1a40f17b11e0326902837e7 100644 (file)
--- 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 97dd82a66a7a9a464f112bb71ea074ca13920333..fbacfa85ad4459003e5fb9d0eef732732f6f97ff 100644 (file)
--- 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 0d392eee15608b68774be9f70f77b2ebcd0b4a9e..c297574bd777a98356034b7f7c94875afe827a16 100644 (file)
--- 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 7cddb89afb1ad99e9acf979529f1ffa570693611..1a2ad56510d53be6fd4620fdc779003a84926ed0 100644 (file)
--- 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 9c17cc6500b3237bd159f5179b33617a4bb465c6..3dbe08b3896212256d48a40b42641e72f105f636 100644 (file)
--- 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 9b59fd5ea74567a399157d4e7eeafb9d77dcc95a..4eedbac2bc2fb96c4e9fa019de107bc22dc0ccb8 100644 (file)
--- 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 0e83d8acf12bad1f1b5d30550c2d3e7d21186d35..7cbd43faa091e9edda7386f5dfe21fe6738c631f 100644 (file)
--- 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 e74e4d60db954972d36ebaa79744dc3840c8f379..73702acc21c0cd57ea921d2f04d4a777d1b7b6b4 100644 (file)
--- 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 63997777cc1379957a006e42d2c8abc015a72942..aa3845bf0029ce27c55c181990fc4b647ddad2dd 100644 (file)
--- 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 0b95113118f1a32d39ca17c7c39c9ed6fcb6634b..fddccf02963f288f2e588f2ed3b6fba6fbee8865 100644 (file)
--- 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 b77be893c6992b0f67362a69c71b6fc19c34fb96..71c4cb9dc8125e3a5c4b6febfdb0b91da8b59a99 100644 (file)
--- 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