From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 1/3] Revert "test: use gpgconf --create-socketdir if available"
Date: Mon, 27 Feb 2017 20:26:48 -0400 [thread overview]
Message-ID: <20170228002650.26762-2-david@tethera.net> (raw)
In-Reply-To: <20170228002650.26762-1-david@tethera.net>
This reverts commit e7b88e8b0a93ca83d807edc00e0c97af54c5b5f1.
It turns out that this does not work well in environments without a
running systemd (or some other provider of /run/user)
---
test/test-lib.sh | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/test/test-lib.sh b/test/test-lib.sh
index ba1580cd..86e792a8 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -229,19 +229,10 @@ 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"
}
@@ -1285,11 +1276,6 @@ 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
--
2.11.0
next prev parent reply other threads:[~2017-02-28 0:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-28 0:26 Take two of making gpg using tests more robust David Bremner
2017-02-28 0:26 ` David Bremner [this message]
2017-02-28 0:26 ` [PATCH 2/3] Revert "configure: add test for gpgconf --create-socketdir" David Bremner
2017-02-28 0:26 ` [PATCH 3/3] test: move GNUPGHOME to TEST_TMPDIR David Bremner
2017-02-28 15:05 ` Tomi Ollila
2017-03-01 1:04 ` Daniel Kahn Gillmor
2017-03-01 2:16 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170228002650.26762-2-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).