diff options
| author | Justus Winter <[email protected]> | 2017-03-20 15:36:27 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-03-20 15:41:43 +0000 |
| commit | 16b202d9999591b71fb8bb49f6db10ef96d4cbe8 (patch) | |
| tree | 9f38b74a976a32b91066b1c401fa5de2a21ce5b6 | |
| parent | python: Skip tests if GnuPG is too old. (diff) | |
| download | gpgme-16b202d9999591b71fb8bb49f6db10ef96d4cbe8.tar.gz gpgme-16b202d9999591b71fb8bb49f6db10ef96d4cbe8.zip | |
tests: Use 'gpg-agent --allow-loopback-pinentry' if applicable.
* lang/python/tests/Makefile.am (gpg-agent.conf): Do not hard-code the
option. This breaks gpg-agent from GnuPG 2.0.
* tests/start-stop-agent: Rather, check if the option is supported and
add it to the configuration if it is.
GnuPG-bug-id: 3008
Fixes-commit: bbf19124bbec9eb6298cef2914baae7ac74382fe
Signed-off-by: Justus Winter <[email protected]>
| -rw-r--r-- | lang/python/tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/start-stop-agent | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am index 7251cd30..a935222f 100644 --- a/lang/python/tests/Makefile.am +++ b/lang/python/tests/Makefile.am @@ -117,4 +117,3 @@ clean-local: ./gpg-agent.conf: # This is required for gpg2, which does not support command fd. echo pinentry-program $(abs_top_srcdir)/tests/gpg/pinentry >$@ - echo allow-loopback-pinentry >>$@ diff --git a/tests/start-stop-agent b/tests/start-stop-agent index e843ce5c..457f70d7 100755 --- a/tests/start-stop-agent +++ b/tests/start-stop-agent @@ -38,6 +38,14 @@ fi echo "starting gpg-agent.." >&2 +# GnuPG prior to 2.1.12 needs --allow-loopback-pinentry for the +# loopback entry to work. Old versions do not understand this though, +# so we need to be careful. +if "$GPG_AGENT" --gpgconf-test --allow-loopback-pinentry && + ! grep -q allow-loopback-pinentry "$GNUPGHOME/gpg-agent.conf"; then + echo allow-loopback-pinentry >> "$GNUPGHOME/gpg-agent.conf" +fi + gpg-connect-agent --agent-program="${GPG_AGENT}|--debug-quick-random" putval\ $token\ set /bye if [ $? -ne 0 -o "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \ != "D set" ]; then |