diff options
| author | Justus Winter <justus@g10code.com> | 2016-09-30 16:22:40 +0200 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2016-10-04 13:23:17 +0200 |
| commit | 4a232d23a8f51bebf9ee382e480248b4bde30f28 (patch) | |
| tree | 160c2de5f7fcfcad3b82e2b2e264199cdaf13cf3 /configure.ac | |
| parent | tests,w32: Do not expose 'glob' to gpgscm. (diff) | |
| download | gnupg2-4a232d23a8f51bebf9ee382e480248b4bde30f28.tar.xz gnupg2-4a232d23a8f51bebf9ee382e480248b4bde30f28.zip | |
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>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 85cd69a79..9c591ed6a 100644 --- a/configure.ac +++ b/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. # |