diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-30 22:40:02 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-30 22:40:02 +0100 |
| commit | a300724a321a26770ccf701e0a638c7bfa93fa5c (patch) | |
| tree | c7d9b316f0c4769cd9d418ca8c5ae48f5e088b7c /tests/setup/gnupg | |
| parent | f8ba14071c7977a0ea2d8f1882202136b7b88dce (diff) | |
| parent | 8916ea3e2ca88820e6ad1d0c8823a37221f8ed88 (diff) | |
Merge remote-tracking branch 'dgit/dgit/experimental'
Conflicts:
debian/changelog
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/setup/gnupg')
| -rwxr-xr-x | tests/setup/gnupg | 6 |
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 |