mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
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>
This commit is contained in:
parent
63ea1e5432
commit
4fb50623a7
@ -19,10 +19,13 @@
|
|||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
|
#include "virstring.h"
|
||||||
#include "virutil.h"
|
#include "virutil.h"
|
||||||
#include "testutils.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
|
#define TEST_FC_HOST_NUM 5
|
||||||
|
|
||||||
/* Test virIsCapableFCHost */
|
/* Test virIsCapableFCHost */
|
||||||
@ -158,6 +161,12 @@ mymain(void)
|
|||||||
{
|
{
|
||||||
int ret = 0;
|
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)
|
if (virtTestRun("test1", 1, test1, NULL) < 0)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
if (virtTestRun("test2", 1, test2, NULL) < 0)
|
if (virtTestRun("test2", 1, test2, NULL) < 0)
|
||||||
@ -169,6 +178,8 @@ mymain(void)
|
|||||||
if (virtTestRun("test5", 1, test5, NULL) < 0)
|
if (virtTestRun("test5", 1, test5, NULL) < 0)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
VIR_FREE(fchost_prefix);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user