mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
build,w32: Unconditionally build tests.
* 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:
parent
41b510f9c5
commit
4a232d23a8
3 changed files with 4 additions and 26 deletions
11
configure.ac
11
configure.ac
|
@ -626,7 +626,6 @@ have_dosish_system=no
|
|||
have_w32_system=no
|
||||
have_w32ce_system=no
|
||||
have_android_system=no
|
||||
run_tests=yes
|
||||
use_simple_gettext=no
|
||||
use_ldapwrapper=yes
|
||||
mmap_needed=yes
|
||||
|
@ -643,7 +642,6 @@ case "${host}" in
|
|||
have_dosish_system=yes
|
||||
have_w32_system=yes
|
||||
require_iconv=no
|
||||
run_tests=no
|
||||
use_ldapwrapper=no # Fixme: Do this only for CE.
|
||||
case "${host}" in
|
||||
*-mingw32ce*)
|
||||
|
@ -702,7 +700,6 @@ case "${host}" in
|
|||
# Android is fully utf-8 and we do not want to use iconv to
|
||||
# keeps things simple
|
||||
require_iconv=no
|
||||
run_tests=no
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
|
@ -733,11 +730,6 @@ if test "$have_android_system" = yes; then
|
|||
fi
|
||||
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)
|
||||
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(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.
|
||||
#
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue