Merge branch 'tz/gpg-test-fix'

Test fix.

* tz/gpg-test-fix:
t/lib-gpg: drop redundant killing of gpg-agent
t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt

diff --cc t/lib-gpg.sh
index f1277bef4fa65e72607ea1f2dac326048559e6aa,041f10171aeb9c0f49a3f8ce583f41f755919031..8d28652b729b46cb08de8ddd4347dddda9e246a7
--- 1/t/lib-gpg.sh
--- 2/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@@ -57,14 -57,10 +57,13 @@@ the
                echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
                        --passphrase-fd 0 --pinentry-mode loopback \
                        --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
 -              gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
 -                      | grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
 -                      ${GNUPGHOME}/trustlist.txt &&
 +
 +              gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K |
 +              grep fingerprint: |
 +              cut -d" " -f4 |
 +              tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
 +
-               echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
-               (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
+               echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
                echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
                        -u committer@example.com -o /dev/null --sign - 2>&1 &&
                test_set_prereq GPGSM