test suite: gpg agent workaround: Neaten the logging.

[dgit.git] / tests / setup / gnupg

diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index 9b4d09908e107cb73cfa8e40f13e4f8837c793a4..7a164eff2bd9b569b18c93040b598f26da921f81 100755 (executable)
--- 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,7 @@ eval "$setup"
 
 gpg --list-secret
 
-t-setup-done '' 'gnupg' "$setup"
+t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' \
+       'gnupg' "$setup"
 
 t-ok