summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/gpgsm/Makefile.am1
-rwxr-xr-xtests/start-stop-agent13
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