diff options
| author | David Bremner <david@tethera.net> | 2017-02-21 08:16:07 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-02-21 08:16:07 -0400 |
| commit | 9951598d11f9e883374d295f886009cdb64d8f63 (patch) | |
| tree | cc41a08a34aa9f804818d96c45b101decfc25f23 /test | |
| parent | 0e037c34dd4b7eb9be96e62e0ee18260291de1b2 (diff) | |
| parent | 928016a4ea0de23960b9c44b9f5d556b8878b5ab (diff) | |
Merge branch 'release'
Merge changes to use gpgconf --create-socketdir
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-lib.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index 6f9468ae..67be917e 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -230,10 +230,19 @@ test_fixed=0 test_broken=0 test_success=0 + +_shutdown_gpg_agent () { + if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then + gpgconf --kill gpg-agent + gpgconf --remove-socketdir + fi +} + _exit_common () { code=$? trap - EXIT set +ex + _shutdown_gpg_agent rm -rf "$TEST_TMPDIR" } @@ -1277,6 +1286,11 @@ test_init_ () { . ./test-lib-common.sh || exit 1 +# we need the setting of GNUPGHOME in test-lib-common.sh +if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then + gpgconf --create-socketdir +fi + emacs_generate_script |