diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-06 13:56:42 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-07 16:18:53 +0000 |
commit | 146a5fd470b72ea0a034c1da808d78e08b203351 (patch) | |
tree | 19f252537da297432d5f080f216ab5d1af7ba89e /tests/setup | |
parent | 3c29a528a1b7241778f947a38d3ee5a8e2fb2154 (diff) |
test suite: gnupg setup: give each individual test its own AGENT.log
This was always the intent. However, the structure here arranged to
put the actual value of GNUPGHOME into the import script.
Instead, move the GNUGPHOME setting into the setup fragment, which is
evaluated by the importer.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/setup')
-rwxr-xr-x | tests/setup/gnupg | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/setup/gnupg b/tests/setup/gnupg index 43a5c96..9b4d099 100755 --- a/tests/setup/gnupg +++ b/tests/setup/gnupg @@ -6,18 +6,17 @@ mkdir -p $tmp/gnupg cp $troot/gnupg/* $tmp/gnupg chmod go-rw $tmp/gnupg/* -export GNUPGHOME=$tmp/gnupg +setup=' + export GNUPGHOME=$tmp/gnupg -cat >$tmp/gnupg/gpg-agent.conf <<END -log-file $tmp/gnupg/AGENT.log + cat >$tmp/gnupg/gpg-agent.conf <<END + log-file $tmp/gnupg/AGENT.log END -#debug-all + #debug-all -setup=' : ${DGIT_TEST_REAL_GPG_AGENT:=$(type -p gpg-agent)} export DGIT_TEST_REAL_GPG_AGENT=$(type -p gpg-agent) export DGIT_STUNT_AGENT=$troot/tstunt/gpg-agent - export GNUPGHOME t-tstunt gpg ' @@ -25,6 +24,6 @@ eval "$setup" gpg --list-secret -t-setup-done 'GNUPGHOME' 'gnupg' "$setup" +t-setup-done '' 'gnupg' "$setup" t-ok |