aboutsummaryrefslogtreecommitdiffstats
path: root/tests/cms
diff options
context:
space:
mode:
Diffstat (limited to 'tests/cms')
-rw-r--r--tests/cms/Makefile.am4
-rw-r--r--tests/cms/all-tests.scm2
-rw-r--r--tests/cms/run-tests.scm2
3 files changed, 7 insertions, 1 deletions
diff --git a/tests/cms/Makefile.am b/tests/cms/Makefile.am
index 999bd4fb8..60fdf0281 100644
--- a/tests/cms/Makefile.am
+++ b/tests/cms/Makefile.am
@@ -28,13 +28,15 @@ 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.
OLD_TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
GNUPG_IN_TEST_SUITE=fact \
- GPGSM="$(GPGSM)" "$(srcdir)/runtest"
+ GPGSM="$(GPGSM)$(EXEEXT)" "$(srcdir)/runtest"
TESTS_ENVIRONMENT = LC_ALL=C \
EXEEXT=$(EXEEXT) \
diff --git a/tests/cms/all-tests.scm b/tests/cms/all-tests.scm
index 78ad00678..6d4c5822a 100644
--- a/tests/cms/all-tests.scm
+++ b/tests/cms/all-tests.scm
@@ -30,12 +30,14 @@
(make-environment-cache
(test::scm
#f
+ #f
(path-join "tests" "cms" "setup.scm")
(in-srcdir "tests" "cms" "setup.scm")
"--" "tests" "gpg")))
(map (lambda (name)
(test::scm setup
+ #f
(path-join "tests" "cms" name)
(in-srcdir "tests" "cms" name)))
(parse-makefile-expand (in-srcdir "tests" "cms" "Makefile.am")
diff --git a/tests/cms/run-tests.scm b/tests/cms/run-tests.scm
index caae86d5b..7079ed3ca 100644
--- a/tests/cms/run-tests.scm
+++ b/tests/cms/run-tests.scm
@@ -28,6 +28,7 @@
(define setup
(make-environment-cache (test::scm
#f
+ #f
(path-join "tests" "cms" "setup.scm")
(in-srcdir "tests" "cms" "setup.scm"))))
@@ -35,5 +36,6 @@
(load-tests "tests" "cms")
(map (lambda (name)
(test::scm setup
+ #f
(path-join "tests" "cms" name)
(in-srcdir "tests" "cms" name))) tests)))