diff options
| author | Ruediger Meier | 2015-01-20 12:22:35 +0100 |
|---|---|---|
| committer | Ruediger Meier | 2015-01-20 13:12:29 +0100 |
| commit | fa8f8b7469b732318c8a69b81ccf5180ad143113 (patch) | |
| tree | ab2b1425967cb7e7080351a49f952990bf7fd10d /tests/functions.sh | |
| parent | libmount: revert "read mtab on remount" idea (diff) | |
| download | kernel-qcow2-util-linux-fa8f8b7469b732318c8a69b81ccf5180ad143113.tar.gz kernel-qcow2-util-linux-fa8f8b7469b732318c8a69b81ccf5180ad143113.tar.xz kernel-qcow2-util-linux-fa8f8b7469b732318c8a69b81ccf5180ad143113.zip | |
tests: python tests should not remove user's LD_LIBRARY_PATH
LD_LIBRARY_PATH must be preserved like it's done in libtool's
temporary wrapper scripts.
This problem was noticed when building with Intel's icc (15.0.0):
$ make check TS_OPTS="libmount"
$ tail tests/diff/libmount/tabfiles-py-parse-mtab
[...]
+Traceback (most recent call last):
+ File "/tmp/util-linux/libmount/python/test_mount_tab.py", line 8, in <module>
+ import pylibmount as mnt
+ImportError: libimf.so: cannot open shared object file: No such file or directory
... although libimf.so was in LD_LIBRARY_PATH.
NOTE 1:
When running root checks "sudo -E" is not enough to preserve
LD_LIBRARY_PATH because glibc already removes is. This would work:
$ sudo -E env LD_LIBRARY_PATH=$LD_LIBRARY_PATH make check TS_OPTS="--parallel=1"
NOTE 2:
We also preserve PYTHONPATH which could bring us similar problems if
the user has a customized python installation.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/functions.sh')
| -rw-r--r-- | tests/functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index a9b37581d..852a6a313 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -332,8 +332,8 @@ function ts_init_py { [ -f "$top_builddir/py${LIBNAME}.la" ] || ts_skip "py${LIBNAME} not compiled" - export LD_LIBRARY_PATH="$top_builddir/.libs" - export PYTHONPATH="$top_builddir/$LIBNAME/python:$top_builddir/.libs" + export LD_LIBRARY_PATH="$top_builddir/.libs:$LD_LIBRARY_PATH" + export PYTHONPATH="$top_builddir/$LIBNAME/python:$top_builddir/.libs:$PYTHONPATH" export PYTHON_VERSION=$(awk '/^PYTHON_VERSION/ { print $3 }' $top_builddir/Makefile) export PYTHON_MAJOR_VERSION=$(echo $PYTHON_VERSION | sed 's/\..*//') |