From 4fb50623a7dbcfccce051363af5f5b9be76368e5 Mon Sep 17 00:00:00 2001 From: Viktor Mihajlovski Date: Thu, 16 May 2013 17:49:59 +0200 Subject: [PATCH] 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 --- tests/fchosttest.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 +#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; } -- GitLab