diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-04-10 10:54:29 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-04-11 09:11:00 +0200 |
| commit | 64cbc1876d41283d8d2244ed51ef7c449be4ea9e (patch) | |
| tree | 85e652f9ee8eebb13dd3d975591ea7336ce6a565 | |
| parent | 39501ef6ee826b36a570bd233e3d5b0017dbd2a3 (diff) | |
| download | gnutls-64cbc1876d41283d8d2244ed51ef7c449be4ea9e.tar.gz | |
tests: do not enable valgrind in non-git builds
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 01a71bf29f..d1a9a02fb5 100644 --- a/configure.ac +++ b/configure.ac @@ -89,7 +89,6 @@ if test "$use_cxx" != "no"; then AC_LANG_POP(C++) fi AM_CONDITIONAL(ENABLE_CXX, test "$use_cxx" != "no") -AM_CONDITIONAL(WANT_TEST_SUITE, [test -f "${srcdir}/tests/suite/mini-eagain2.c"]) dnl Detect windows build use_accel=yes @@ -273,6 +272,13 @@ if test "$ac_have_unicode" != "yes";then fi fi +SUITE_FILE="${srcdir}/tests/suite/mini-eagain2.c" +if test -f "$SUITE_FILE";then + can_do_valgrind_tests=yes +else + can_do_valgrind_tests=no +fi + dnl Note that g*l_INIT are run after we check for library capabilities, dnl to prevent issues from caching lib dependencies. See discussion dnl in https://bugs.gentoo.org/show_bug.cgi?id=494940 and @@ -280,6 +286,14 @@ dnl http://gnu-autoconf.7623.n7.nabble.com/Correct-way-to-check-for-clock-gettim gl_INIT ggl_INIT +if test "$can_do_valgrind_tests" != "yes";then + VALGRIND="" + AC_SUBST(VALGRIND, []) + opt_valgrind_tests=no +fi + +AM_CONDITIONAL(WANT_TEST_SUITE, [test "$opt_valgrind_tests" != no]) + dnl GCC warnings to enable AC_ARG_ENABLE([gcc-warnings], @@ -907,7 +921,6 @@ AC_CONFIG_FILES([ AC_OUTPUT dnl Warning flags: errors: ${WERROR_CFLAGS} warnings: ${WARN_CFLAGS} -dnl Valgrind: $opt_valgrind_tests ${VALGRIND} AC_MSG_NOTICE([summary of build options: version: ${VERSION} shared $LT_CURRENT:$LT_REVISION:$LT_AGE @@ -915,6 +928,7 @@ AC_MSG_NOTICE([summary of build options: Build system: ${build} Install prefix: ${prefix} Compiler: ${CC} + Valgrind: $opt_valgrind_tests ${VALGRIND} CFlags: ${CFLAGS} Library types: Shared=${enable_shared}, Static=${enable_static} Local libopts: ${included_libopts} |