From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 9 Jan 2017 12:15:46 +0000 (+0000)
Subject: test suite: gnupg: Do not reset DGIT_TEST_REAL_GPG_AGENT
X-Git-Tag: archive/debian/3.0~37
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=79ba79d96c6adecfaea9967ddeeaff428d671585;hp=7aa972091b66cb66b77c44bd9c180161fd2c6977

test suite: gnupg: Do not reset DGIT_TEST_REAL_GPG_AGENT

Otherwise it might end up pointing to the wrapper, if we run the setup
twice for some reason (for example, in an adt run).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index 6100bf57..43a5c96d 100755
--- a/tests/setup/gnupg
+++ b/tests/setup/gnupg
@@ -14,6 +14,7 @@ END
 #debug-all
 
 setup='
+	: ${DGIT_TEST_REAL_GPG_AGENT:=$(type -p gpg-agent)}
 	export DGIT_TEST_REAL_GPG_AGENT=$(type -p gpg-agent)
 	export DGIT_STUNT_AGENT=$troot/tstunt/gpg-agent
 	export GNUPGHOME