4 files changed, 24 insertions, 20 deletions
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 170b1a7e..4ceb6102 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -19,11 +19,11 @@
 
 ## Process this file with automake to produce Makefile.in
 
-GPG = gpg
-GPG_AGENT = gpg-agent
+GPG = gpg$(EXEEXT)
+GPG_AGENT = gpg-agent$(EXEEXT)
 
 GNUPGHOME=$(abs_builddir)
-TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \
                     top_srcdir=$(top_srcdir)
 
 # The keylist tests must come after the import and the edit test.
@@ -97,7 +97,7 @@ clean-local:
 	-rm -fR private-keys-v1.d
 
 gpg-sample.stamp: $(srcdir)/$(private_keys)
-	-$(TESTS_ENVIRONMENT) gpgconf --kill all
+	-$(TESTS_ENVIRONMENT) gpgconf$(EXEEXT) --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
 	  cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index f07b78ac..6ce8e339 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -19,11 +19,11 @@
 
 ## Process this file with automake to produce Makefile.in
 
-GPGSM = gpgsm
-GPG_AGENT = gpg-agent
+GPGSM = gpgsm$(EXEEXT)
+GPG_AGENT = gpg-agent$(EXEEXT)
 
 GNUPGHOME=$(abs_builddir)
-TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \
                     top_srcdir=$(top_srcdir)
 
 noinst_HEADERS = t-support.h
diff --git a/tests/json/Makefile.am b/tests/json/Makefile.am
index 1f17173a..5f34b849 100644
--- a/tests/json/Makefile.am
+++ b/tests/json/Makefile.am
@@ -19,11 +19,11 @@
 
 ## Process this file with automake to produce Makefile.in
 
-GPGME_JSON=$(abs_builddir)/../../src/gpgme-json
-GPG = gpg
+GPGME_JSON=$(abs_builddir)/../../src/gpgme-json$(EXEEXT)
+GPG = gpg$(EXEEXT)
 
 GNUPGHOME=$(abs_builddir)
-TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \
                     top_srcdir=$(top_srcdir) gpgme_json=$(GPGME_JSON)
 
 c_tests = t-json
diff --git a/tests/start-stop-agent b/tests/start-stop-agent
index 3ce6f22a..67a63119 100755
--- a/tests/start-stop-agent
+++ b/tests/start-stop-agent
@@ -8,30 +8,30 @@
 # WARRANTY, to the extent permitted by law; without even the implied
 # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-if [ -z "$(command -v gpg-connect-agent)" ]; then
+if [ -z "$(command -v gpg-connect-agent$EXEEXT)" ]; then
    echo "gpg-agent not installed and thus not started" >&2
    exit 0;
 fi
 
 GPG_AGENT_INFO=
 export GPG_AGENT_INFO
-GPG_AGENT=$(which gpg-agent)
+GPG_AGENT=$(which gpg-agent$EXEEXT)
 
 token=$(echo "gpgme-$(pwd)" | tr ' ' '_')
 
 if [ "$1" = "--stop" ]; then
-  if [ "$(gpg-connect-agent --no-autostart getval\ $token /bye 2>/dev/null | head -1)" \
-        != "D set" ]; then
+  RES=$(gpg-connect-agent$EXEEXT --no-autostart "getval $token" /bye 2>/dev/null | tr -d '\r' | head -1)
+  if [ "$RES" != "D set" ]; then
     echo "gpg-agent not running" >&2
     exit 0
   fi
   echo "stopping gpg-agent " >&2
-  gpg-connect-agent KILLAGENT /bye >/dev/null 2>&1
+  gpg-connect-agent$EXEEXT KILLAGENT /bye >/dev/null 2>&1
   exit 0
 fi
 
-if [ "$(gpg-connect-agent --no-autostart getval\ $token /bye 2>/dev/null | head -1)" \
-      = "D set" ]; then
+RES=$(gpg-connect-agent$EXEEXT --no-autostart "getval $token" /bye 2>/dev/null | tr -d '\r' | head -1)
+if [ "$RES" = "D set" ]; then
   echo "gpg-agent already running" >&2
   exit 0
 fi
@@ -47,9 +47,13 @@ if "$GPG_AGENT" --gpgconf-test --allow-loopback-pinentry &&
     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
+gpg-connect-agent$EXEEXT --agent-program="${GPG_AGENT}|--debug-quick-random" "putval $token set" /bye
+if [ $? -ne 0 ]; then
+  echo "error starting gpg-agent" >&2
+  exit 1
+fi
+RES=$(gpg-connect-agent$EXEEXT "getval $token" /bye 2>/dev/null | tr -d '\r' | head -1)
+if [ "$RES" != "D set" ]; then
   echo "error starting gpg-agent" >&2
   exit 1
 fi