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

diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index c88d40be..56e4e661 100755
--- a/tests/setup/gnupg
+++ b/tests/setup/gnupg
@@ -7,10 +7,11 @@ 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
+	export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG
 
 	cat >$tmp/gnupg/gpg-agent.conf <<END
 	log-file $tmp/gnupg/AGENT.log
@@ -27,6 +28,5 @@ eval "$setup"
 
 gpg --list-secret
 
-t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK' 'gnupg' "$setup"
-
-t-ok
+t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' \
+	'gnupg' "$setup"