X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Fsetup%2Fgnupg;h=56e4e661900cc9aa37cb5bc7a74d5ecabe395f61;hb=2a2b0931f9b29bf372136451d317eb81649424e2;hp=9b4d09908e107cb73cfa8e40f13e4f8837c793a4;hpb=146a5fd470b72ea0a034c1da808d78e08b203351;p=dgit.git

diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index 9b4d0990..56e4e661 100755
--- a/tests/setup/gnupg
+++ b/tests/setup/gnupg
@@ -6,8 +6,12 @@ mkdir -p $tmp/gnupg
 cp $troot/gnupg/* $tmp/gnupg
 chmod go-rw $tmp/gnupg/*
 
+export DGIT_TEST_GNUPG_GLOBAL_LOCK=$tmp/gnupg/dgit-test-global-lock
+export DGIT_TEST_GNUPG_LOG=$tmp/gnupg-workarounds.log
+
 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
@@ -24,6 +28,5 @@ eval "$setup"
 
 gpg --list-secret
 
-t-setup-done '' 'gnupg' "$setup"
-
-t-ok
+t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' \
+	'gnupg' "$setup"