test: copyright information updates

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

diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
index f99ed11162ade498eaef756b9a65774a6a29afec..ba4a8e112084ec7db5cdc7241e1271f8bcc349ec 100644 (file)
--- a/test/test-lib-common.sh
+++ b/test/test-lib-common.sh
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2005 Junio C Hamano
 #
 # Copyright (c) 2005 Junio C Hamano

+# Copyright (c) 2010 Notmuch Developers

 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -34,13 +35,25 @@ find_notmuch_path ()
     done
 }
 
     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 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=`find_notmuch_path "$TEST_DIRECTORY"`
 
 # configure output

-. $notmuch_path/sh.config
+. $notmuch_path/sh.config || exit 1

 
 if test -n "$valgrind"
 then
 
 if test -n "$valgrind"
 then