test suite: gpg agent workaround: Neaten the logging.

[dgit.git] / tests / setup / gnupg

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