X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Fsetup%2Fgnupg;h=c88d40be47f7fce7a5cacec963d1b63e9bbf2625;hb=759d9092784d1aea335bd277e930c8f50ef0a493;hp=d23ecfa34147f5fb441419b680cc8069a25fd34c;hpb=6b959bf443c37b26f058aed813885c469c660828;p=dgit.git

diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index d23ecfa3..c88d40be 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
+
+setup='
+	export GNUPGHOME=$tmp/gnupg
+	export DGIT_TEST_GNUPG_GLOBAL_LOCK
+
+	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
+'
+
+eval "$setup"
 
 gpg --list-secret
 
-t-setup-done 'GNUPGHOME' 'gnupg'
+t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK' 'gnupg' "$setup"
 
 t-ok