From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id A47F56DE20F0 for ; Mon, 27 Feb 2017 16:27:12 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.005 X-Spam-Level: X-Spam-Status: No, score=-0.005 tagged_above=-999 required=5 tests=[AWL=0.006, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AUKeSePD_7ab for ; Mon, 27 Feb 2017 16:27:11 -0800 (PST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id B7A0C6DE2101 for ; Mon, 27 Feb 2017 16:27:11 -0800 (PST) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1ciVce-0002oU-Ki; Mon, 27 Feb 2017 19:26:32 -0500 Received: (nullmailer pid 26842 invoked by uid 1000); Tue, 28 Feb 2017 00:27:09 -0000 From: David Bremner 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 Message-Id: <20170228002650.26762-2-david@tethera.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170228002650.26762-1-david@tethera.net> References: <20170228002650.26762-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 00:27:12 -0000 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