提交 ea8389dd 编写于 作者: J Jiri Denemark 提交者: Eric Blake

tests: Fix commandtest in VPATH build

上级 3c63a15b
...@@ -544,19 +544,26 @@ cleanup: ...@@ -544,19 +544,26 @@ cleanup:
static int test15(const void *unused ATTRIBUTE_UNUSED) static int test15(const void *unused ATTRIBUTE_UNUSED)
{ {
virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper");
char *cwd = NULL;
int ret = -1;
virCommandSetWorkingDirectory(cmd, abs_builddir "/commanddata"); if (virAsprintf(&cwd, "%s/commanddata", abs_srcdir) < 0)
goto cleanup;
virCommandSetWorkingDirectory(cmd, cwd);
if (virCommandRun(cmd, NULL) < 0) { if (virCommandRun(cmd, NULL) < 0) {
virErrorPtr err = virGetLastError(); virErrorPtr err = virGetLastError();
printf("Cannot run child %s\n", err->message); printf("Cannot run child %s\n", err->message);
virCommandFree(cmd); goto cleanup;
return -1;
} }
ret = checkoutput("test15");
cleanup:
VIR_FREE(cwd);
virCommandFree(cmd); virCommandFree(cmd);
return checkoutput("test15"); return ret;
} }
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册