diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2022-04-06 04:28:00 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2022-04-06 04:28:00 +0200 |
| commit | 39d478f5ba5d74cdd1d2e40311ff120c932bac37 (patch) | |
| tree | f5ad2b34666e29f226222c2eaf0de7749a86994c /common | |
| parent | agent:w32: Fix for use of socket. (diff) | |
| download | gnupg2-39d478f5ba5d74cdd1d2e40311ff120c932bac37.tar.xz gnupg2-39d478f5ba5d74cdd1d2e40311ff120c932bac37.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/cms/Makefile.am: Add $(EXEEXT).
* tests/gpgme/Makefile.am: Likewise.
* tests/migrations/Makefile.am: Likewise.
* tests/openpgp/Makefile.am: Likewise.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile.am | 5 | ||||
| -rw-r--r-- | common/t-stringhelp.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index d8368fc22..f3fb60f2d 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -170,11 +170,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 8d0c1c576..4086f8c3d 100644 --- a/common/t-stringhelp.c +++ b/common/t-stringhelp.c @@ -88,7 +88,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) { |