summaryrefslogtreecommitdiff
path: root/tests/setup/gnupg
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-30 10:21:32 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-30 10:54:53 +0100
commit690272dfb77eefa9277970dafe4bbb47de3b35e1 (patch)
tree641af3cf4ace1dfe9f798a52f0d8953c2bedf8e6 /tests/setup/gnupg
parent38eae0db7f393311667bec9dfe0aa7a514b893bd (diff)
test suite: gpg agent workaround: Neaten the logging.debian/5.5+exp8archive/debian/5.5+exp8
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/setup/gnupg')
-rwxr-xr-xtests/setup/gnupg6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index c88d40b..7a164ef 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,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