summaryrefslogtreecommitdiff
path: root/tests/setup/gnupg
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-07-12 08:33:17 +0100
committerSean Whitton <spwhitton@spwhitton.name>2018-07-12 08:33:17 +0100
commitae8f33be945323e02e670a97c8ac6d42a0e1be40 (patch)
tree2bbf98c464b32b8ede618bf93929741246b81b5f /tests/setup/gnupg
parent4a142fe137c1bed5a0cb5d14c41adcb3355458c4 (diff)
parent7166dbc963a9c01ce62a0564bb7b905156adb560 (diff)
Merge tag 'debian/5.8' into stretch-bpo
dgit release 5.8 for unstable (sid) [dgit] [dgit distro=debian] # gpg: Signature made Sun 08 Jul 2018 11:43:29 BST # gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 # gpg: Can't check signature: No public key
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