X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FT040-setup.sh;h=56efe1d57b496536166a8db1d90d3d2bc3b652a1;hb=c5356b9ed56e42d36ca18206155b62c94cfbd79d;hp=be2f0dbd967f6dc091db34a56c50cbf8435fd953;hpb=792bea5aff135107fd970f51f3ef8c65f68194de;p=notmuch

diff --git a/test/T040-setup.sh b/test/T040-setup.sh
index be2f0dbd..56efe1d5 100755
--- a/test/T040-setup.sh
+++ b/test/T040-setup.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 test_description='"notmuch setup"'
-. ./test-lib.sh || exit 1
+. $(dirname "$0")/test-lib.sh || exit 1
 
 test_begin_subtest "Notmuch new without a config suggests notmuch setup"
 output=$(notmuch --config=new-notmuch-config new 2>&1)
@@ -19,6 +19,12 @@ another.suite@example.com
 foo bar
 baz
 EOF
+
+if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then
+    config_gpg_path="crypto.gpg_path=gpg
+"
+fi
+
 output=$(notmuch --config=new-notmuch-config config list | notmuch_built_with_sanitize)
 test_expect_equal "$output" "\
 database.path=/path/to/maildir
@@ -29,8 +35,9 @@ new.tags=foo;bar;
 new.ignore=
 search.exclude_tags=baz;
 maildir.synchronize_flags=true
-crypto.gpg_path=gpg
+""${config_gpg_path}""\
 built_with.compact=something
-built_with.field_processor=something"
+built_with.field_processor=something
+built_with.retry_lock=something"
 
 test_done