debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: set LD_LIBRARY_PATH early and keep its old contents

Browse source 
Previously LD_LIBRARY_PATH was exported (and environment changed)
in the middle of test case execution, when a function setting it
was called.

Previously the old contents of LD_LIBRARY_PATH was lost (if any)
when it was re-set and exported. In some systems the old contents of
LD_LIBRARY_PATH was needed to e.g. locate suitable gmime library.
This commit is contained in:
Tomi Ollila 2016-05-26 00:37:40 +03:00 committed by David Bremner
parent 65c219560f
commit f0e5317bcd
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/T360-symbol-hiding.sh
View file

@ -13,9 +13,8 @@ test_description='exception symbol hiding'
test_begin_subtest 'running test' run_test test_begin_subtest 'running test' run_test
mkdir -p ${PWD}/fakedb/.notmuch mkdir -p ${PWD}/fakedb/.notmuch
( LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \ $TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent 2>&1 \
$TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent \ | notmuch_dir_sanitize | sed -e "s,\`,\',g" -e "s,${NOTMUCH_DEFAULT_XAPIAN_BACKEND},backend,g" > OUTPUT
2>&1 | notmuch_dir_sanitize | sed -e "s,\`,\',g" -e "s,${NOTMUCH_DEFAULT_XAPIAN_BACKEND},backend,g") > OUTPUT
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian' A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian'

5
test/test-lib-common.sh
View file

@ -58,6 +58,11 @@ restore_database () {
TEST_DIRECTORY=$(pwd -P) TEST_DIRECTORY=$(pwd -P)
notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"` notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`
# Prepend $TEST_DIRECTORY/../lib to LD_LIBRARY_PATH, to make tests work
# on systems where ../notmuch depends on LD_LIBRARY_PATH.
LD_LIBRARY_PATH=${TEST_DIRECTORY%/*}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
# configure output # configure output
. $notmuch_path/sh.config || exit 1 . $notmuch_path/sh.config || exit 1

3
test/test-lib.sh
View file

@ -1192,7 +1192,6 @@ test_emacs () {
} }
test_python() { test_python() {
export LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib
export PYTHONPATH=$TEST_DIRECTORY/../bindings/python export PYTHONPATH=$TEST_DIRECTORY/../bindings/python
(echo "import sys; _orig_stdout=sys.stdout; sys.stdout=open('OUTPUT', 'w')"; cat) \ (echo "import sys; _orig_stdout=sys.stdout; sys.stdout=open('OUTPUT', 'w')"; cat) \
@ -1200,7 +1199,6 @@ test_python() {
} }
test_ruby() { test_ruby() {
export LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib
MAIL_DIR=$MAIL_DIR ruby -I $TEST_DIRECTORY/../bindings/ruby> OUTPUT MAIL_DIR=$MAIL_DIR ruby -I $TEST_DIRECTORY/../bindings/ruby> OUTPUT
} }
@ -1208,7 +1206,6 @@ test_C () {
exec_file="test${test_count}" exec_file="test${test_count}"
test_file="${exec_file}.c" test_file="${exec_file}.c"
cat > ${test_file} cat > ${test_file}
export LD_LIBRARY_PATH=${TEST_DIRECTORY}/../lib
${TEST_CC} ${TEST_CFLAGS} -I${TEST_DIRECTORY}/../lib -o ${exec_file} ${test_file} -L${TEST_DIRECTORY}/../lib/ -lnotmuch -ltalloc ${TEST_CC} ${TEST_CFLAGS} -I${TEST_DIRECTORY}/../lib -o ${exec_file} ${test_file} -L${TEST_DIRECTORY}/../lib/ -lnotmuch -ltalloc
echo "== stdout ==" > OUTPUT.stdout echo "== stdout ==" > OUTPUT.stdout
echo "== stderr ==" > OUTPUT.stderr echo "== stderr ==" > OUTPUT.stderr