diff options
| author | Tomi Ollila <tomi.ollila@iki.fi> | 2017-03-12 13:59:14 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-03-12 09:19:23 -0300 |
| commit | 936c35da86aebf76b14f4ba198f760403455cfe0 (patch) | |
| tree | 6a6aeaed8defc97be3820be852aa98535cafe488 | |
| parent | 35cdebdad0d41be58a4c705ec48fd1bb51f098eb (diff) | |
fix out of tree tests
Use $NOTMUCH_SRCDIR/ instead of $TEST_DIRECTORY/../ (in those 2 places)
where reference to source directory instead of build directory is
required.
| -rw-r--r-- | test/test-lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index 32bd3f12..988b00af 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -1121,7 +1121,7 @@ test_emacs () { test_python() { # Note: if there is need to print debug information from python program, # use stdout = os.fdopen(6, 'w') or stderr = os.fdopen(7, 'w') - PYTHONPATH="$TEST_DIRECTORY/../bindings/python${PYTHONPATH:+:$PYTHONPATH}" \ + PYTHONPATH="$NOTMUCH_SRCDIR/bindings/python${PYTHONPATH:+:$PYTHONPATH}" \ $NOTMUCH_PYTHON -B - > OUTPUT } @@ -1133,7 +1133,7 @@ test_C () { exec_file="test${test_count}" test_file="${exec_file}.c" cat > ${test_file} - ${TEST_CC} ${TEST_CFLAGS} -I${TEST_DIRECTORY} -I${TEST_DIRECTORY}/../lib -o ${exec_file} ${test_file} -L${TEST_DIRECTORY}/../lib/ -lnotmuch -ltalloc + ${TEST_CC} ${TEST_CFLAGS} -I${TEST_DIRECTORY} -I${NOTMUCH_SRCDIR}/lib -o ${exec_file} ${test_file} -L${TEST_DIRECTORY}/../lib/ -lnotmuch -ltalloc echo "== stdout ==" > OUTPUT.stdout echo "== stderr ==" > OUTPUT.stderr ./${exec_file} "$@" 1>>OUTPUT.stdout 2>>OUTPUT.stderr |