X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Ftest-lib-common.sh;h=4e17b781e26298c3abefec9ec7d2c1e7e9e28644;hb=45df509cb6fd642bc5895f2c7869a354c1255f4b;hp=4903038dd9ce531ea7dda467a0d0eac6f86d8bd4;hpb=f92342cb76fa3e1fa2f1c2e727f8ddf1a5c21b7d;p=notmuch

diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
index 4903038d..4e17b781 100644
--- a/test/test-lib-common.sh
+++ b/test/test-lib-common.sh
@@ -34,13 +34,25 @@ find_notmuch_path ()
     done
 }
 
+backup_database () {
+    test_name=$(basename $0 .sh)
+    rm -rf notmuch-dir-backup."$test_name"
+    cp -pR ${MAIL_DIR}/.notmuch notmuch-dir-backup."${test_name}"
+}
+
+restore_database () {
+    test_name=$(basename $0 .sh)
+    rm -rf ${MAIL_DIR}/.notmuch
+    cp -pR 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=$(pwd)
+TEST_DIRECTORY=$(pwd -P)
 notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`
 
 # configure output
-. $notmuch_path/sh.config
+. $notmuch_path/sh.config || exit 1
 
 if test -n "$valgrind"
 then
@@ -122,7 +134,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
 }