changelog: start 9.14

[dgit.git] / tests / setup / gnupg

diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index 97cdb6498bb53f94c0b6befbb370da8b8d5657e8..56e4e661900cc9aa37cb5bc7a74d5ecabe395f61 100755 (executable)
--- 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
 
-echo ok.
+t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' \
+       'gnupg' "$setup"