Merge tag '0.18.2_rc1'

[notmuch] / test / test-lib-common.sh

diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
index e1eaa5a03984ccd2372d9e60e2b74cdc0dcd2225..4903038dd9ce531ea7dda467a0d0eac6f86d8bd4 100644 (file)
--- a/test/test-lib-common.sh
+++ b/test/test-lib-common.sh
@@ -38,6 +38,10 @@ find_notmuch_path ()
 # test/ subdirectory and are run in 'trash directory' subdirectory.
 TEST_DIRECTORY=$(pwd)
 notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`
+
+# configure output
+. $notmuch_path/sh.config
+
 if test -n "$valgrind"
 then
        make_symlink () {
@@ -98,12 +102,12 @@ then
        PATH=$GIT_VALGRIND/bin:$PATH
        GIT_EXEC_PATH=$GIT_VALGRIND/bin
        export GIT_VALGRIND
-       test -n "$notmuch_path" && MANPATH="$notmuch_path/man:$MANPATH"
+       test -n "$notmuch_path" && MANPATH="$notmuch_path/doc/_build/man"
 else # normal case
        if test -n "$notmuch_path"
                then
                        PATH="$notmuch_path:$PATH"
-                       MANPATH="$notmuch_path/man:$MANPATH"
+                       MANPATH="$notmuch_path/doc/_build/man"
                fi
 fi
 export PATH MANPATH