chiark / gitweb /
test suite: gnupg: Do not reset DGIT_TEST_REAL_GPG_AGENT
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 9 Jan 2017 12:15:46 +0000 (12:15 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 9 Jan 2017 12:38:07 +0000 (12:38 +0000)
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>
tests/setup/gnupg

index 6100bf5..43a5c96 100755 (executable)
@@ -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