config: deprecate/drop crypto.gpg_path under gmime 2.6/3.0

[notmuch] / test / T040-setup.sh

diff --git a/test/T040-setup.sh b/test/T040-setup.sh
index cf0c00bc5c1fcd3900754db00cee34cf8be7c428..998bd6e0798a26c0cc23cee47a8cdd8690d66f24 100755 (executable)
--- a/test/T040-setup.sh
+++ b/test/T040-setup.sh
@@ -19,7 +19,13 @@ another.suite@example.com
 foo bar
 baz
 EOF
-output=$(notmuch --config=new-notmuch-config config list)
+
+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
 user.name=Test Suite
@@ -29,6 +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.retry_lock=something"
 
 test_done