diff options
| author | NIIBE Yutaka <[email protected]> | 2022-04-06 02:28:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-11-25 12:59:10 +0000 |
| commit | b13c0b595ebdddc7760eeab901ee5a6d0e8daa10 (patch) | |
| tree | e4c12f81f2e061427303d899bfbcf28e98960b43 | |
| parent | scd: Redact --debug cardio output of a VERIFY APDU. (diff) | |
| download | gnupg-b13c0b595ebdddc7760eeab901ee5a6d0e8daa10.tar.gz gnupg-b13c0b595ebdddc7760eeab901ee5a6d0e8daa10.zip | |
w32: Fix for make check.
* common/Makefile.am (module_tests): Exclude t-exechelp and
t-exectool.
* common/t-stringhelp.c (mygetcwd): Convert '\' to '/'.
* tests/gpgme/Makefile.am: Add $(EXEEXT).
* tests/migrations/Makefile.am: Likewise.
* tests/openpgp/Makefile.am: Likewise.
--
Backport master commit of:
39d478f5ba5d74cdd1d2e40311ff120c932bac37
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | common/Makefile.am | 5 | ||||
| -rw-r--r-- | common/t-stringhelp.c | 10 | ||||
| -rw-r--r-- | tests/gpgme/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/migrations/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/openpgp/Makefile.am | 2 |
5 files changed, 14 insertions, 7 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index bd281d603..1cc89a08f 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -169,11 +169,10 @@ module_tests = t-stringhelp t-timestuff \ 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-w32-cmdline -if !HAVE_W32CE_SYSTEM -module_tests += t-exechelp t-exectool -endif if HAVE_W32_SYSTEM module_tests += t-w32-reg +else +module_tests += t-exechelp t-exectool endif if MAINTAINER_MODE diff --git a/common/t-stringhelp.c b/common/t-stringhelp.c index d76991f91..7d25cbd18 100644 --- a/common/t-stringhelp.c +++ b/common/t-stringhelp.c @@ -89,7 +89,15 @@ mygetcwd (void) return buffer; #else if (getcwd (buffer, size) == buffer) - return buffer; + { +#ifdef HAVE_W32_SYSTEM + char *p; + for (p = buffer; *p; p++) + if (*p == '\\') + *p = '/'; +#endif + return buffer; + } xfree (buffer); if (errno != ERANGE) { diff --git a/tests/gpgme/Makefile.am b/tests/gpgme/Makefile.am index 60fb01df9..8b1f3c7df 100644 --- a/tests/gpgme/Makefile.am +++ b/tests/gpgme/Makefile.am @@ -45,7 +45,7 @@ check: xcheck .PHONY: xcheck xcheck: - $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \ + $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \ $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS) EXTRA_DIST = gpgme-defs.scm run-tests.scm setup.scm wrap.scm all-tests.scm diff --git a/tests/migrations/Makefile.am b/tests/migrations/Makefile.am index 6d2d2e8a6..4eaacb945 100644 --- a/tests/migrations/Makefile.am +++ b/tests/migrations/Makefile.am @@ -53,7 +53,7 @@ check: xcheck .PHONY: xcheck xcheck: - $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \ + $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \ $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS) EXTRA_DIST = common.scm run-tests.scm setup.scm all-tests.scm \ diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index 59f39e2f7..2b06fb18c 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -116,7 +116,7 @@ check: xcheck .PHONY: xcheck xcheck: - $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \ + $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \ $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS) TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \ |