aboutsummaryrefslogtreecommitdiff
path: root/test/T030-config.sh
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2017-07-14 15:12:00 +0200
committerDavid Bremner <david@tethera.net>2017-07-14 21:23:52 -0300
commite142de643d3bb4354f70e1490a97b491d1116e95 (patch)
treecb192df604b692bc415584c2c66e993efa6a7864 /test/T030-config.sh
parent8492298a613e8e666d0f3054dadcb98b72a65ae4 (diff)
config: deprecate/drop crypto.gpg_path under gmime 2.6/3.0
gmime 3.0 no longer offers a means to set the path for gpg. Users can set $PATH anyway if they want to pick a differently-installed gpg (e.g. /usr/local/bin/gpg), so this isn't much of a reduction in functionality. The one main difference is for people who have tried to use "gpg2" to make use of gpg 2.1, but that isn't usefully co-installable anyway.
Diffstat (limited to 'test/T030-config.sh')
-rwxr-xr-xtest/T030-config.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/T030-config.sh b/test/T030-config.sh
index 79a24948..35d757f6 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -44,6 +44,12 @@ test_expect_equal "$(notmuch config get foo.nonexistent)" ""
test_begin_subtest "List all items"
notmuch config list 2>&1 | notmuch_config_sanitize > OUTPUT
+
+if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then
+ config_gpg_path="crypto.gpg_path=gpg
+"
+fi
+
cat <<EOF > EXPECTED
Error opening database at MAIL_DIR/.notmuch: No such file or directory
database.path=MAIL_DIR
@@ -54,8 +60,7 @@ new.tags=unread;inbox;
new.ignore=
search.exclude_tags=
maildir.synchronize_flags=true
-crypto.gpg_path=gpg
-foo.string=this is another string value
+${config_gpg_path}foo.string=this is another string value
foo.list=this;is another;list value;
built_with.compact=something
built_with.field_processor=something