tests: More fix for semihosted environment.

* common/all-tests.scm: Conditionalize by *win32*.
* tests/cms/Makefile.am (GPGSM): Add missing GPGSM.
* tests/pkits/Makefile.am (TESTS_ENVIRONMENT): Add EXEEXT.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

common/all-tests.scm

@@ -23,7 +23,7 @@
 	  (test::binary #f
 		        (path-join "common" name-ext)
 		        (path-join (getenv "objdir") "common" name-ext))))
-      (list "t-stringhelp"
+      `("t-stringhelp"
 	"t-timestuff"
 	"t-convert"
 	"t-percent"
@@ -41,6 +41,9 @@
 	"t-name-value"
 	"t-ccparray"
 	"t-recsel"
-	    "t-exechelp"
-	    "t-exectool"
+	,@(if *win32*
+	      '("t-w32-reg"
+		"t-w32-cmdline")
+	      '("t-exechelp"
+		"t-exectool"))
 	)))

tests/cms/Makefile.am

@@ -28,6 +28,8 @@ include $(top_srcdir)/am/cmacros.am
 
 AM_CFLAGS =
 
+GPGSM = ../../sm/gpgsm
+
 # Note that we need to use /bin/pwd so that we don't get into trouble
 # if the shell used for inittests would uses an internal version of
 # pwd which handles symlinks differently.

tests/pkits/Makefile.am

@@ -23,7 +23,7 @@ GPGSM = ../../sm/gpgsm
 TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
                     GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
 		    GNUPG_IN_TEST_SUITE=fact \
-                    GPGSM=$(GPGSM) silent=yes
+                    GPGSM=$(GPGSM)$(EXEEXT) silent=yes
 
 
 testscripts = import-all-certs validate-all-certs \