[libvirt] [PATCH 03/11] tests: drivermodule: Drop unused macro arguments

Peter Krempa pkrempa at redhat.com
Wed Feb 8 16:27:03 UTC 2017


Refactors of the test resulted into the second argument of the 'TEST'
macro to be unused. Drop them.
---
 tests/virdrivermoduletest.c | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 870a07de6..09c1a614b 100644
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -47,53 +47,50 @@ mymain(void)
 {
     int ret = 0;

-#define TEST(name, dep1)                                                   \
+#define TEST(name)                                                         \
     do  {                                                                  \
         if (virTestRun("Test driver " # name, testDriverModule, name) < 0) \
             ret = -1;                                                      \
     } while (0)

 #ifdef WITH_NETWORK
-# define USE_NETWORK "network"
-    TEST("network", NULL);
-#else
-# define USE_NETWORK NULL
+    TEST("network");
 #endif
 #ifdef WITH_INTERFACE
-    TEST("interface", NULL);
+    TEST("interface");
 #endif
 #ifdef WITH_STORAGE
-    TEST("storage", NULL);
+    TEST("storage");
 #endif
 #ifdef WITH_NODE_DEVICES
-    TEST("nodedev", NULL);
+    TEST("nodedev");
 #endif
 #ifdef WITH_SECRETS
-    TEST("secret", NULL);
+    TEST("secret");
 #endif
 #ifdef WITH_NWFILTER
-    TEST("nwfilter", NULL);
+    TEST("nwfilter");
 #endif
 #ifdef WITH_XEN
-    TEST("xen", NULL);
+    TEST("xen");
 #endif
 #ifdef WITH_LIBXL
-    TEST("libxl", NULL);
+    TEST("libxl");
 #endif
 #ifdef WITH_QEMU
-    TEST("qemu", USE_NETWORK);
+    TEST("qemu");
 #endif
 #ifdef WITH_LXC
-    TEST("lxc", USE_NETWORK);
+    TEST("lxc");
 #endif
 #ifdef WITH_UML
-    TEST("uml", NULL);
+    TEST("uml");
 #endif
 #ifdef WITH_VBOX
-    TEST("vbox", NULL);
+    TEST("vbox");
 #endif
 #ifdef WITH_BHYVE
-    TEST("bhyve", NULL);
+    TEST("bhyve");
 #endif

     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-- 
2.11.0




More information about the libvir-list mailing list