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: unbreak performance tests

Browse source 
In 8e7fb88237 Jani replaced the use of $(pwd -P) to find the
TEST_DIRECTORY in order to better support out of tree
builds. Unfortunately the performance-tests need a different value for
the variable and were thus broken.

This commit splits out the setting of this variable for the two sets
of tests.  Performance tests still don't work out of tree, because
the handling of the downloaded corpus needs to be updated.
This commit is contained in:
David Bremner 2017-12-02 08:53:04 -04:00
parent cf08295c50
commit 1e4e8e3bf5
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
performance-test/perf-test-lib.sh
View file

@ -29,6 +29,9 @@ done
# Ensure NOTMUCH_SRCDIR and NOTMUCH_BUILDDIR are set. # Ensure NOTMUCH_SRCDIR and NOTMUCH_BUILDDIR are set.
. $(dirname "$0")/../test/export-dirs.sh || exit 1 . $(dirname "$0")/../test/export-dirs.sh || exit 1
# Where to run the tests
TEST_DIRECTORY=$NOTMUCH_BUILDDIR/performance-test
. "$NOTMUCH_SRCDIR/test/test-lib-common.sh" || exit 1 . "$NOTMUCH_SRCDIR/test/test-lib-common.sh" || exit 1
set -e set -e

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

@ -41,10 +41,6 @@ restore_database () {
cp -pR $TMP_DIRECTORY/notmuch-dir-backup."${test_name}" ${MAIL_DIR}/.notmuch cp -pR $TMP_DIRECTORY/notmuch-dir-backup."${test_name}" ${MAIL_DIR}/.notmuch
} }
# Test the binaries we have just built. The tests are kept in
# test/ subdirectory and are run in 'trash directory' subdirectory.
TEST_DIRECTORY=$NOTMUCH_BUILDDIR/test
# Prepend $TEST_DIRECTORY/../lib to LD_LIBRARY_PATH, to make tests work # Prepend $TEST_DIRECTORY/../lib to LD_LIBRARY_PATH, to make tests work
# on systems where ../notmuch depends on LD_LIBRARY_PATH. # on systems where ../notmuch depends on LD_LIBRARY_PATH.
LD_LIBRARY_PATH=${TEST_DIRECTORY%/*}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=${TEST_DIRECTORY%/*}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}

3
test/test-lib.sh
View file

@ -1066,6 +1066,9 @@ test_init_ () {
} }
# Where to run the tests
TEST_DIRECTORY=$NOTMUCH_BUILDDIR/test
. "$NOTMUCH_SRCDIR/test/test-lib-common.sh" || exit 1 . "$NOTMUCH_SRCDIR/test/test-lib-common.sh" || exit 1
if [ "${NOTMUCH_GMIME_MAJOR}" = 3 ]; then if [ "${NOTMUCH_GMIME_MAJOR}" = 3 ]; then