diff options
| author | Ruediger Meier | 2014-06-04 00:17:58 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2014-06-04 10:14:24 +0200 |
| commit | 15b2606c4f86dbb73abf41cdecfba7f65fd5bb22 (patch) | |
| tree | d195e146471c5b31f52e5721fed31c4bcf947d4f /tests/functions.sh | |
| parent | build-sys: fix update-potfiles script (diff) | |
| download | kernel-qcow2-util-linux-15b2606c4f86dbb73abf41cdecfba7f65fd5bb22.tar.gz kernel-qcow2-util-linux-15b2606c4f86dbb73abf41cdecfba7f65fd5bb22.tar.xz kernel-qcow2-util-linux-15b2606c4f86dbb73abf41cdecfba7f65fd5bb22.zip | |
tests: fix python tests for dist and out-of-tree builds
- add python helper scripts to the dist
- helper scripts are always in srcdir
- python libs are in builddir
- abort tests if helpers are missing
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/functions.sh')
| -rw-r--r-- | tests/functions.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index 85f0e0fac..31ad481f4 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -316,10 +316,10 @@ function ts_init_suid { function ts_init_py { LIBNAME="$1" - [ -f "$TS_TOPDIR/../py${LIBNAME}.la" ] || ts_skip "py${LIBNAME} not compiled" + [ -f "$top_builddir/py${LIBNAME}.la" ] || ts_skip "py${LIBNAME} not compiled" - export LD_LIBRARY_PATH="$TS_TOPDIR/../.libs" - export PYTHONPATH="$TS_TOPDIR/../$LIBNAME/python:$TS_TOPDIR/../.libs" + export LD_LIBRARY_PATH="$top_builddir/.libs" + export PYTHONPATH="$top_builddir/$LIBNAME/python:$top_builddir/.libs" export PYTHON_VERSION=$(awk '/^PYTHON_VERSION/ { print $3 }' $top_builddir/Makefile) export PYTHON_MAJOR_VERSION=$(echo $PYTHON_VERSION | sed 's/\..*//') |