Merge tag 'debian/0.32.3-1'

[notmuch] / test / T055-path-config.sh

diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index bb3bf6657214642fb6b5b311d567c06e7a28af4e..6f41e2cf067cafc2f08da288b375751fa589960d 100755 (executable)
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -16,6 +16,7 @@ restore_config () {
     unset DATABASE_PATH
     unset NOTMUCH_PROFILE
     unset XAPIAN_PATH
+    unset MAILDIR
     rm -f "$HOME/mail"
     cp notmuch-config-backup.${test_name} ${NOTMUCH_CONFIG}
 }
@@ -55,6 +56,18 @@ home_mail_config () {
     unset DATABASE_PATH
 }
 
+maildir_env_config () {
+    local dir
+    backup_config
+    dir="${HOME}/env_points_here"
+    ln -s $MAIL_DIR $dir
+    export MAILDIR=$dir
+    notmuch config set database.path
+    notmuch config set database.mail_root
+    XAPIAN_PATH="${MAIL_DIR}/.notmuch/xapian"
+    unset DATABASE_PATH
+}
+
 xdg_config () {
     local dir
     local profile=${1:-default}
@@ -79,7 +92,7 @@ xdg_config () {
     notmuch --config=${CONFIG_PATH} config set database.path
 }
 
-for config in traditional split XDG XDG+profile symlink home_mail; do
+for config in traditional split XDG XDG+profile symlink home_mail maildir_env; do
     #start each set of tests with an known set of messages
     add_email_corpus
 
@@ -106,6 +119,9 @@ for config in traditional split XDG XDG+profile symlink home_mail; do
        home_mail)
            home_mail_config
            ;;
+       maildir_env)
+           maildir_env_config
+           ;;
     esac
 
     test_begin_subtest "count ($config)"
@@ -190,6 +206,7 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
 > basic reply test
 EOF
     test_expect_equal_file EXPECTED OUTPUT
+
     test_begin_subtest "insert+search ($config)"
     generate_message \
        "[subject]=\"insert-subject\"" \
@@ -250,11 +267,13 @@ EOF
    test_expect_equal "${output}+${output2}" "${value}+"
 
    test_begin_subtest "Config list ($config)"
-   notmuch config list | notmuch_dir_sanitize | sed -e "s/^database.backup_dir=.*$/database.backup_dir/"  \
-                                                   -e "s/^database.hook_dir=.*$/database.hook_dir/" \
-                                                   -e "s/^database.path=.*$/database.path/"  \
-                                                   -e "s,^database.mail_root=CWD/home/mail,database.mail_root=MAIL_DIR," \
-                                                   > OUTPUT
+   notmuch config list | notmuch_dir_sanitize | \
+       sed -e "s/^database.backup_dir=.*$/database.backup_dir/"  \
+          -e "s/^database.hook_dir=.*$/database.hook_dir/" \
+          -e "s/^database.path=.*$/database.path/"  \
+          -e "s,^database.mail_root=CWD/home/mail,database.mail_root=MAIL_DIR," \
+          -e "s,^database.mail_root=CWD/home/env_points_here,database.mail_root=MAIL_DIR," \
+          > OUTPUT
    cat <<EOF > EXPECTED
 built_with.compact=true
 built_with.field_processor=true