tests: testQemuCapsIterate: Pass inputDir to callback

Right now users need to know input file live inside
TEST_QEMU_CAPS_PATH, which is bad layering.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index bb4ce74a2959d97fc18bf41d1669da5a1f508b11..6b8d2676e319bda2b414041ea7a1a0f0be1424dc 100644 (file)
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -49,7 +49,6 @@ testQemuDataInit(testQemuDataPtr data)
     if (qemuTestDriverInit(&data->driver) < 0)
         return -1;
 
-    data->inputDir = TEST_QEMU_CAPS_PATH;
     data->outputDir = TEST_QEMU_CAPS_PATH;
 
     data->ret = 0;
@@ -180,7 +179,8 @@ testQemuCapsCopy(const void *opaque)
 
 
 static int
-doCapsTest(const char *base,
+doCapsTest(const char *inputDir,
+           const char *base,
            const char *archName,
            void *opaque)
 {
@@ -193,6 +193,7 @@ doCapsTest(const char *base,
         return -1;
     }
 
+    data->inputDir = inputDir;
     data->base = base;
     data->archName = archName;
 

diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index f5aecaa391af1189c0f2106d0c3027d467f22a7c..8985b20ac65dc7c852958d29c7a260f469167b33 100644 (file)
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -39,7 +39,6 @@ struct _testQemuData {
 static int
 testQemuDataInit(testQemuDataPtr data)
 {
-    data->inputDir = TEST_QEMU_CAPS_PATH;
     data->outputDir = abs_srcdir "/qemucaps2xmloutdata";
 
     data->ret = 0;
@@ -174,7 +173,8 @@ testQemuCapsXML(const void *opaque)
 }
 
 static int
-doCapsTest(const char *base,
+doCapsTest(const char *inputDir,
+           const char *base,
            const char *archName,
            void *opaque)
 {
@@ -184,6 +184,7 @@ doCapsTest(const char *base,
     if (virAsprintf(&title, "%s (%s)", base, archName) < 0)
         return -1;
 
+    data->inputDir = inputDir;
     data->base = base;
     data->archName = archName;
 

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index c60225514940df35d4fa10cc8585e3309ff982fe..75c8180c7a5eb5ae9b83464e6f47f402a790c89b 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -937,7 +937,7 @@ testQemuCapsIterate(const char *suffix,
         archName++;
 
         /* Run the user-provided callback */
-        if (callback(base, archName, opaque) < 0)
+        if (callback(TEST_QEMU_CAPS_PATH, base, archName, opaque) < 0)
             goto cleanup;
     }
 

diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
index a2f7bfcc2691e26c85a1899f3abce6bcfa7c63d6..07373f8ce65878d06bc0ce3563069ddcf318783c 100644 (file)
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -96,7 +96,8 @@ char *testQemuGetLatestCapsForArch(const char *arch,
                                    const char *suffix);
 virHashTablePtr testQemuGetLatestCaps(void);
 
-typedef int (*testQemuCapsIterateCallback)(const char *base,
+typedef int (*testQemuCapsIterateCallback)(const char *inputDir,
+                                           const char *base,
                                            const char *archName,
                                            void *opaque);
 int testQemuCapsIterate(const char *suffix,