X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Fsetup%2Fgnupg;h=56e4e661900cc9aa37cb5bc7a74d5ecabe395f61;hb=69aae724c3d05a20219e5a9642e162dd65ef2fe9;hp=d23ecfa34147f5fb441419b680cc8069a25fd34c;hpb=f773b1ed2796196e0fa801886fce493544c38fe0;p=dgit.git

diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index d23ecfa3..56e4e661 100755
--- a/tests/setup/gnupg
+++ b/tests/setup/gnupg
@@ -6,10 +6,27 @@ mkdir -p $tmp/gnupg
 cp $troot/gnupg/* $tmp/gnupg
 chmod go-rw $tmp/gnupg/*
 
-export GNUPGHOME=$tmp/gnupg
+export DGIT_TEST_GNUPG_GLOBAL_LOCK=$tmp/gnupg/dgit-test-global-lock
+export DGIT_TEST_GNUPG_LOG=$tmp/gnupg-workarounds.log
 
-gpg --list-secret
+setup='
+	export GNUPGHOME=$tmp/gnupg
+	export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG
+
+	cat >$tmp/gnupg/gpg-agent.conf <<END
+	log-file $tmp/gnupg/AGENT.log
+END
+	#debug-all
+
+	: ${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
+	t-tstunt gpg
+'
 
-t-setup-done 'GNUPGHOME' 'gnupg'
+eval "$setup"
+
+gpg --list-secret
 
-t-ok
+t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' \
+	'gnupg' "$setup"