diff options
| author | NIIBE Yutaka <[email protected]> | 2026-01-09 07:16:40 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2026-01-09 07:16:40 +0100 |
| commit | 9a1f409499c4e086e95c8dbca712929ee3c418ef (patch) | |
| tree | 7fbafff2d7c3e30d5a66a39d2ecdab9e51a67a57 /tests | |
| parent | w32:spawn: Support the case without no helper. (diff) | |
| download | gpgme-9a1f409499c4e086e95c8dbca712929ee3c418ef.tar.gz gpgme-9a1f409499c4e086e95c8dbca712929ee3c418ef.zip | |
tests: It's start-stop-agent which invokes gpg-agent.
* tests/gpgsm/Makefile.am (gpgsm.conf): Don't touch agent-program.
* tests/start-stop-agent: Don't modify gpg.conf and gpgsm.conf.
--
When start-stop-agent fails, this allows invocation of gpg-agent
by gpg/gpgsm. This enables semihosted build.
Fixes-commit: 9cd2b58dfb2c21cce64520cf4c726859b583d14e
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gpgsm/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/start-stop-agent | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am index 63de7477..f07b78ac 100644 --- a/tests/gpgsm/Makefile.am +++ b/tests/gpgsm/Makefile.am @@ -63,7 +63,6 @@ pubring-stamp: $(srcdir)/cert_g10code_test1.der gpg-sample.stamp gpgsm.conf: echo disable-crl-checks > ./gpgsm.conf echo faked-system-time 1008241200 >> ./gpgsm.conf - echo "agent-program `which $(GPG_AGENT)`|--debug-quick-random" >> ./gpgsm.conf gpg-sample.stamp: $(srcdir)/$(key_id) -$(TESTS_ENVIRONMENT) gpgconf --kill all diff --git a/tests/start-stop-agent b/tests/start-stop-agent index 9b08b55b..3ce6f22a 100755 --- a/tests/start-stop-agent +++ b/tests/start-stop-agent @@ -30,19 +30,6 @@ if [ "$1" = "--stop" ]; then exit 0 fi -# Update 'agent-program' in the configuration files to make sure we -# will always start exactly this agent again if we ever need to. -for F in gpg.conf gpgsm.conf -do - if test -f "$GNUPGHOME/$F" - then - cat "$GNUPGHOME/$F" > "$GNUPGHOME/$F~" - sed -e "s#^agent-program.*#agent-program ${GPG_AGENT}|--debug-quick-random#" \ - >"$GNUPGHOME/$F" <"$GNUPGHOME/$F~" - rm -f "$GNUPGHOME/$F~" - fi -done - if [ "$(gpg-connect-agent --no-autostart getval\ $token /bye 2>/dev/null | head -1)" \ = "D set" ]; then echo "gpg-agent already running" >&2 |