From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <bremner@tethera.net>
Received: from localhost (localhost [127.0.0.1])
 by arlo.cworth.org (Postfix) with ESMTP id 3CC126DE20F0
 for <notmuch@notmuchmail.org>; Mon, 27 Feb 2017 16:27:20 -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 HP1xEZXCoFX2 for <notmuch@notmuchmail.org>;
 Mon, 27 Feb 2017 16:27:19 -0800 (PST)
Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])
 by arlo.cworth.org (Postfix) with ESMTPS id 7708E6DE212B
 for <notmuch@notmuchmail.org>; Mon, 27 Feb 2017 16:27:18 -0800 (PST)
Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2)
 (envelope-from <bremner@tethera.net>)
 id 1ciVcl-0002pA-7I; Mon, 27 Feb 2017 19:26:39 -0500
Received: (nullmailer pid 26856 invoked by uid 1000);
 Tue, 28 Feb 2017 00:27:16 -0000
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 3/3] test: move GNUPGHOME to TEST_TMPDIR
Date: Mon, 27 Feb 2017 20:26:50 -0400
Message-Id: <20170228002650.26762-4-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."
 <notmuch.notmuchmail.org>
List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Feb 2017 00:27:20 -0000

We already use this directory for dtach sockets, so it makes sense to
put gnupg sockets there as well. There doesn't seem to be a clean way
to put a fully functional socket in a different location than
GNUPGHOME.
---
 test/test-lib-common.sh | 1 -
 test/test-lib.sh        | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
index 03ef1d2d..a96cfbeb 100644
--- a/test/test-lib-common.sh
+++ b/test/test-lib-common.sh
@@ -158,7 +158,6 @@ export HOME="${TMP_DIRECTORY}/home"
 mkdir -p "${HOME}"
 
 MAIL_DIR="${TMP_DIRECTORY}/mail"
-export GNUPGHOME="${TMP_DIRECTORY}/gnupg"
 export NOTMUCH_CONFIG="${TMP_DIRECTORY}/notmuch-config"
 
 mkdir -p "${test}"
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 86e792a8..518d9c7f 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -270,6 +270,8 @@ die () {
 GIT_EXIT_OK=
 # Note: TEST_TMPDIR *NOT* exported!
 TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XXXXXX")
+# Put GNUPGHOME in TMPDIR to avoid problems with long paths.
+export GNUPGHOME="${TEST_TMPDIR}/gnupg"
 trap 'trap_exit' EXIT
 trap 'trap_signal' HUP INT TERM
 
-- 
2.11.0