security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

w32: Fix for make check.

Browse Source 
* 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>
This commit is contained in:
NIIBE Yutaka 2022-04-06 11:28:00 +09:00
parent 48ee11722d
commit 39d478f5ba
6 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/Makefile.am
View File

@ -170,11 +170,10 @@ module_tests = t-stringhelp t-timestuff \
t-session-env t-openpgp-oid t-ssh-utils \ t-session-env t-openpgp-oid t-ssh-utils \
t-mapstrings t-zb32 t-mbox-util t-iobuf t-strlist \ t-mapstrings t-zb32 t-mbox-util t-iobuf t-strlist \
t-name-value t-ccparray t-recsel t-w32-cmdline 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 if HAVE_W32_SYSTEM
module_tests += t-w32-reg module_tests += t-w32-reg
else
module_tests += t-exechelp t-exectool
endif endif
if MAINTAINER_MODE if MAINTAINER_MODE

10
common/t-stringhelp.c
View File

@ -88,7 +88,15 @@ mygetcwd (void)
return buffer; return buffer;
#else #else
if (getcwd (buffer, size) == buffer) 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); xfree (buffer);
if (errno != ERANGE) if (errno != ERANGE)
{ {

2
tests/cms/Makefile.am
View File

@ -61,7 +61,7 @@ check: xcheck
.PHONY: xcheck .PHONY: xcheck
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) $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
KEYS = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939 KEYS = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939

2
tests/gpgme/Makefile.am
View File

@ -46,7 +46,7 @@ check: xcheck
.PHONY: xcheck .PHONY: xcheck
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) $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
EXTRA_DIST = gpgme-defs.scm run-tests.scm setup.scm wrap.scm all-tests.scm EXTRA_DIST = gpgme-defs.scm run-tests.scm setup.scm wrap.scm all-tests.scm

2
tests/migrations/Makefile.am
View File

@ -54,7 +54,7 @@ check: xcheck
.PHONY: xcheck .PHONY: xcheck
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) $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
EXTRA_DIST = common.scm run-tests.scm setup.scm all-tests.scm \ EXTRA_DIST = common.scm run-tests.scm setup.scm all-tests.scm \

2
tests/openpgp/Makefile.am
View File

@ -114,7 +114,7 @@ check: xcheck
.PHONY: xcheck .PHONY: xcheck
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) $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \