X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Ftest-lib-common.sh;h=b1fc33d4044d45a2cc248508604094174b0efaf2;hb=f76d8f82dd004cf14426a91e8a80dcd2a4b97317;hp=e1eaa5a03984ccd2372d9e60e2b74cdc0dcd2225;hpb=20b7e0ff2f12e612dee00efc6ff1634aae8172a4;p=notmuch

diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
index e1eaa5a0..b1fc33d4 100644
--- 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 || exit 1
+
 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
@@ -118,7 +122,7 @@ esac
 test ! -z "$debug" || remove_tmp=$TMP_DIRECTORY
 rm -fr "$test" || {
 	GIT_EXIT_OK=t
-	echo >&5 "FATAL: Cannot prepare test area"
+	echo >&6 "FATAL: Cannot prepare test area"
 	exit 1
 }