security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-13 22:21:09 +02:00
Code Activity

build,w32: Unconditionally build tests.

Browse Source 
* configure.ac (run_tests, RUN_TESTS, RUN_GPG_TESTS): Remove
variables.  They are misleadingly named, as they inhibit building the
tests.  There is no reason not to build the tests even when
cross-compiling, as they are only run if one does 'make check'.
* Makefile: Adapt accordingly.
* tests/Makefile.am: Adapt accordingly.  Avoid building 'asschk' on
Windows as it uses non-portable functions.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-09-30 16:22:40 +02:00
parent 41b510f9c5
commit 4a232d23a8
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -90,15 +90,9 @@ else
doc = doc =
endif endif
if RUN_TESTS
tests = tests
else
tests =
endif
SUBDIRS = m4 common kbx \ SUBDIRS = m4 common kbx \
${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \ ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
${tools} po ${doc} ${tests} ${tools} po ${doc} tests
dist_doc_DATA = README dist_doc_DATA = README

11
configure.ac
View File

@ -626,7 +626,6 @@ have_dosish_system=no
have_w32_system=no have_w32_system=no
have_w32ce_system=no have_w32ce_system=no
have_android_system=no have_android_system=no
run_tests=yes
use_simple_gettext=no use_simple_gettext=no
use_ldapwrapper=yes use_ldapwrapper=yes
mmap_needed=yes mmap_needed=yes
@ -643,7 +642,6 @@ case "${host}" in
have_dosish_system=yes have_dosish_system=yes
have_w32_system=yes have_w32_system=yes
require_iconv=no require_iconv=no
run_tests=no
use_ldapwrapper=no # Fixme: Do this only for CE. use_ldapwrapper=no # Fixme: Do this only for CE.
case "${host}" in case "${host}" in
*-mingw32ce*) *-mingw32ce*)
@ -702,7 +700,6 @@ case "${host}" in
# Android is fully utf-8 and we do not want to use iconv to # Android is fully utf-8 and we do not want to use iconv to
# keeps things simple # keeps things simple
require_iconv=no require_iconv=no
run_tests=no
;; ;;
*) *)
;; ;;
@ -733,11 +730,6 @@ if test "$have_android_system" = yes; then
fi fi
AM_CONDITIONAL(HAVE_ANDROID_SYSTEM, test "$have_android_system" = yes) AM_CONDITIONAL(HAVE_ANDROID_SYSTEM, test "$have_android_system" = yes)
if test "$run_tests" = yes; then
AC_DEFINE(RUN_TESTS,1, [Defined if we should run the tests])
fi
AM_CONDITIONAL(RUN_TESTS, test "$run_tests" = yes)
# (These need to go after AC_PROG_CC so that $EXEEXT is defined) # (These need to go after AC_PROG_CC so that $EXEEXT is defined)
AC_DEFINE_UNQUOTED(EXEEXT,"$EXEEXT",[The executable file extension, if any]) AC_DEFINE_UNQUOTED(EXEEXT,"$EXEEXT",[The executable file extension, if any])
@ -1693,9 +1685,6 @@ AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes)
AM_CONDITIONAL(NO_TRUST_MODELS, test "$use_trust_models" = no) AM_CONDITIONAL(NO_TRUST_MODELS, test "$use_trust_models" = no)
AM_CONDITIONAL(USE_TOFU, test "$use_tofu" = yes) AM_CONDITIONAL(USE_TOFU, test "$use_tofu" = yes)
AM_CONDITIONAL(RUN_GPG_TESTS,
test x$cross_compiling = xno -a "$build_gpg" = yes )
# #
# Set some defines for use gpgconf. # Set some defines for use gpgconf.
# #

11
tests/Makefile.am
View File

@ -18,14 +18,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = gpgscm openpgp migrations pkits .
if RUN_GPG_TESTS
openpgp = openpgp
else
openpgp =
endif
SUBDIRS = gpgscm ${openpgp} . migrations pkits
GPGSM = ../sm/gpgsm GPGSM = ../sm/gpgsm
@ -66,7 +59,9 @@ CLEANFILES = inittests.stamp x y y z out err \
DISTCLEANFILES = pubring.kbx~ random_seed DISTCLEANFILES = pubring.kbx~ random_seed
if !HAVE_W32_SYSTEM
noinst_PROGRAMS = asschk noinst_PROGRAMS = asschk
endif
asschk_SOURCES = asschk.c asschk_SOURCES = asschk.c