From 65c6ed1cff96596c4bd30d355d1b80d5a05cfe86 Mon Sep 17 00:00:00 2001 From: Foo Date: Mon, 1 May 2017 01:45:07 +0300 Subject: [PATCH] Try setting LD_LIBRARY_PATH Currently zpython test does not work: libzpython could not load libpython. --- tests/test.sh | 4 ++++ tests/test_shells/test.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test.sh b/tests/test.sh index 5d86cbca..1c6f9881 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -17,6 +17,10 @@ if test "$TRAVIS" = true ; then . virtualenvwrapper.sh workon cpython-ucs2-$UCS2_PYTHON_VARIANT set -e + else + LIBRARY_PATH="$(ldd "$(which python)" | grep libpython | sed 's/^.* => //;s/ .*$//')" + LIBRARY_DIR="$(dirname "${LIBRARY_PATH}")" + export LD_LIBRARY_PATH="$LIBRARY_DIR${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" fi fi diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh index 1dce46db..f3dac6f6 100755 --- a/tests/test_shells/test.sh +++ b/tests/test_shells/test.sh @@ -229,7 +229,7 @@ fi exes="bash zsh busybox tcsh mksh" -if test -z "$TRAVIS_JOB_NUMBER" ; then +if test "$TRAVIS" != "true" ; then # For some reason fish does not work on travis exes="$exes fish" fi