From: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Date: Thu, 16 May 2013 15:49:59 +0000 (+0200)
Subject: test: fix VPATH fchosttest failure
X-Git-Tag: v1.0.6-rc1~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fb50623a7dbcfccce051363af5f5b9be76368e5;p=thirdparty%2Flibvirt.git

test: fix VPATH fchosttest failure

Running make check in a VPATH configured build directory fails
in fchosttest as the test data files are searched for relative to
the current working directory.

Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
---

diff --git a/tests/fchosttest.c b/tests/fchosttest.c
index 035f72110e..76d1795f75 100644
--- a/tests/fchosttest.c
+++ b/tests/fchosttest.c
@@ -19,10 +19,13 @@
 
 #include <config.h>
 
+#include "virstring.h"
 #include "virutil.h"
 #include "testutils.h"
 
-#define TEST_FC_HOST_PREFIX "./fchostdata/fc_host/"
+static char *fchost_prefix;
+
+#define TEST_FC_HOST_PREFIX fchost_prefix
 #define TEST_FC_HOST_NUM 5
 
 /* Test virIsCapableFCHost */
@@ -158,6 +161,12 @@ mymain(void)
 {
     int ret = 0;
 
+    if (virAsprintf(&fchost_prefix, "%s/%s", abs_srcdir,
+                    "fchostdata/fc_host/") < 0) {
+        ret = -1;
+        goto cleanup;
+    }
+
     if (virtTestRun("test1", 1, test1, NULL) < 0)
         ret = -1;
     if (virtTestRun("test2", 1, test2, NULL) < 0)
@@ -169,6 +178,8 @@ mymain(void)
     if (virtTestRun("test5", 1, test5, NULL) < 0)
         ret = -1;
 
+cleanup:
+    VIR_FREE(fchost_prefix);
     return ret;
 }