External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: use PYTHON detected from configure

Browse Source 
Extend configure to pass the detect python binary to C code, and
use it in the test suite, rather than searching PATH

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-12-09 09:30:10 -05:00
parent e1e753848b
commit faeaf6f15d
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -705,6 +705,7 @@ AC_PATH_PROGS([PYTHON], [python3])
if test -z "$PYTHON"; then
AC_MSG_ERROR(['python3' binary is required to build libvirt])
fi
AC_DEFINE_UNQUOTED([PYTHON], "$PYTHON", [path to python binary])
AC_PATH_PROG([FLAKE8], [flake8])
if test -z "$FLAKE8"; then
AC_MSG_WARN(['flake8' binary is required to check python code style])

12
tests/testutils.c
View File

@ -58,7 +58,6 @@ static size_t testCounter;
static virBitmapPtr testBitmap;
char *progname;
static char *python;
virArch virTestHostArch = VIR_ARCH_X86_64;
@ -428,14 +427,9 @@ virTestRewrapFile(const char *filename)
virStringHasSuffix(filename, ".ldargs")))
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);
cmd = virCommandNewArgList(python, script, "--in-place", filename, NULL);
cmd = virCommandNewArgList(PYTHON, script, "--in-place", filename, NULL);
if (virCommandRun(cmd, NULL) < 0)
goto cleanup;
@ -919,9 +913,6 @@ int virTestMain(int argc,
}
}
/* Find python early because some tests override PATH */
python = virFindFileInPath("python");
ret = (func)();
virResetLastError();
@ -931,7 +922,6 @@ int virTestMain(int argc,
fprintf(stderr, " %-3zu %s\n", testCounter, ret == 0 ? "OK" : "FAIL");
}
virLogReset();
VIR_FREE(python);
return ret;
}