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

diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index 6100bf57..56e4e661 100755
--- a/tests/setup/gnupg
+++ b/tests/setup/gnupg
@@ -6,17 +6,21 @@ 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
 
-cat >$tmp/gnupg/gpg-agent.conf <<END
-log-file $tmp/gnupg/AGENT.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
 END
-#debug-all
+	#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
 	t-tstunt gpg
 '
 
@@ -24,6 +28,5 @@ eval "$setup"
 
 gpg --list-secret
 
-t-setup-done 'GNUPGHOME' 'gnupg' "$setup"
-
-t-ok
+t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' \
+	'gnupg' "$setup"