提交 faeaf6f1 编写于 作者: C Cole Robinson

tests: use PYTHON detected from configure

Extend configure to pass the detect python binary to C code, and
use it in the test suite, rather than searching PATH
Reviewed-by: NJán Tomko <jtomko@redhat.com>
Signed-off-by: NCole Robinson <crobinso@redhat.com>
上级 e1e75384
...@@ -705,6 +705,7 @@ AC_PATH_PROGS([PYTHON], [python3]) ...@@ -705,6 +705,7 @@ AC_PATH_PROGS([PYTHON], [python3])
if test -z "$PYTHON"; then if test -z "$PYTHON"; then
AC_MSG_ERROR(['python3' binary is required to build libvirt]) AC_MSG_ERROR(['python3' binary is required to build libvirt])
fi fi
AC_DEFINE_UNQUOTED([PYTHON], "$PYTHON", [path to python binary])
AC_PATH_PROG([FLAKE8], [flake8]) AC_PATH_PROG([FLAKE8], [flake8])
if test -z "$FLAKE8"; then if test -z "$FLAKE8"; then
AC_MSG_WARN(['flake8' binary is required to check python code style]) AC_MSG_WARN(['flake8' binary is required to check python code style])
......
...@@ -58,7 +58,6 @@ static size_t testCounter; ...@@ -58,7 +58,6 @@ static size_t testCounter;
static virBitmapPtr testBitmap; static virBitmapPtr testBitmap;
char *progname; char *progname;
static char *python;
virArch virTestHostArch = VIR_ARCH_X86_64; virArch virTestHostArch = VIR_ARCH_X86_64;
...@@ -428,14 +427,9 @@ virTestRewrapFile(const char *filename) ...@@ -428,14 +427,9 @@ virTestRewrapFile(const char *filename)
virStringHasSuffix(filename, ".ldargs"))) virStringHasSuffix(filename, ".ldargs")))
return 0; return 0;
if (!python) {
fprintf(stderr, "cannot rewrap %s: unable to find python in path", filename);
return -1;
}
script = g_strdup_printf("%s/scripts/test-wrap-argv.py", abs_top_srcdir); script = g_strdup_printf("%s/scripts/test-wrap-argv.py", abs_top_srcdir);
cmd = virCommandNewArgList(python, script, "--in-place", filename, NULL); cmd = virCommandNewArgList(PYTHON, script, "--in-place", filename, NULL);
if (virCommandRun(cmd, NULL) < 0) if (virCommandRun(cmd, NULL) < 0)
goto cleanup; goto cleanup;
...@@ -919,9 +913,6 @@ int virTestMain(int argc, ...@@ -919,9 +913,6 @@ int virTestMain(int argc,
} }
} }
/* Find python early because some tests override PATH */
python = virFindFileInPath("python");
ret = (func)(); ret = (func)();
virResetLastError(); virResetLastError();
...@@ -931,7 +922,6 @@ int virTestMain(int argc, ...@@ -931,7 +922,6 @@ int virTestMain(int argc,
fprintf(stderr, " %-3zu %s\n", testCounter, ret == 0 ? "OK" : "FAIL"); fprintf(stderr, " %-3zu %s\n", testCounter, ret == 0 ? "OK" : "FAIL");
} }
virLogReset(); virLogReset();
VIR_FREE(python);
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册