X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2Ftest-lib.sh;fp=test%2Ftest-lib.sh;h=ba1580cd1f3e803130a373c09a766fc82dbf1e7e;hb=e7b88e8b0a93ca83d807edc00e0c97af54c5b5f1;hp=86e792a85df67007cc66a3925b99e91b8ddb60e3;hpb=12f7d4e61d30fb9a5c99e128ab1aab0bf069cdb4;p=notmuch

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 86e792a8..ba1580cd 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -229,10 +229,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"
 }
 
@@ -1276,6 +1285,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