diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2022-12-01 09:09:45 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2022-12-01 09:09:45 +0100 |
| commit | 594c3274d669ddebd145bef33013a66d3e03e27d (patch) | |
| tree | ea6718b4b2a3a7b8b23b0769f38a2794317f5ab4 | |
| parent | tests: Support semihosted environment. (diff) | |
| download | gnupg2-594c3274d669ddebd145bef33013a66d3e03e27d.tar.xz gnupg2-594c3274d669ddebd145bef33013a66d3e03e27d.zip | |
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>
| -rw-r--r-- | common/all-tests.scm | 45 | ||||
| -rw-r--r-- | tests/cms/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/pkits/Makefile.am | 2 |
3 files changed, 27 insertions, 22 deletions
diff --git a/common/all-tests.scm b/common/all-tests.scm index 6cbbcbe67..7ff7d244d 100644 --- a/common/all-tests.scm +++ b/common/all-tests.scm @@ -23,24 +23,27 @@ (test::binary #f (path-join "common" name-ext) (path-join (getenv "objdir") "common" name-ext)))) - (list "t-stringhelp" - "t-timestuff" - "t-convert" - "t-percent" - "t-gettime" - "t-sysutils" - "t-sexputil" - "t-session-env" - "t-openpgp-oid" - "t-ssh-utils" - "t-mapstrings" - "t-zb32" - "t-mbox-util" - "t-iobuf" - "t-strlist" - "t-name-value" - "t-ccparray" - "t-recsel" - "t-exechelp" - "t-exectool" - ))) + `("t-stringhelp" + "t-timestuff" + "t-convert" + "t-percent" + "t-gettime" + "t-sysutils" + "t-sexputil" + "t-session-env" + "t-openpgp-oid" + "t-ssh-utils" + "t-mapstrings" + "t-zb32" + "t-mbox-util" + "t-iobuf" + "t-strlist" + "t-name-value" + "t-ccparray" + "t-recsel" + ,@(if *win32* + '("t-w32-reg" + "t-w32-cmdline") + '("t-exechelp" + "t-exectool")) + ))) diff --git a/tests/cms/Makefile.am b/tests/cms/Makefile.am index 44bd1ceab..60fdf0281 100644 --- a/tests/cms/Makefile.am +++ b/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. diff --git a/tests/pkits/Makefile.am b/tests/pkits/Makefile.am index 0b90f86ba..d25dd91a6 100644 --- a/tests/pkits/Makefile.am +++ b/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 \ |