diff options
| author | Tim Rühsen <tim.ruehsen@gmx.de> | 2020-01-05 18:25:13 +0100 |
|---|---|---|
| committer | Tim Rühsen <tim.ruehsen@gmx.de> | 2020-01-07 10:47:12 +0100 |
| commit | a6a930f01a22da3deea6817ea2cf42808276532d (patch) | |
| tree | 2e35422f5cf818264b87355197d9b5172b3cd2e4 | |
| parent | 14794f5707c2414f9dcb64a629948fba7753510a (diff) | |
| download | gnutls-tmp-soft-libev.tar.gz | |
SKIP tests/suite/eagain if libev not availabletmp-soft-libev
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | tests/suite/Makefile.am | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 8aa72f443b..4e579c2d9d 100644 --- a/configure.ac +++ b/configure.ac @@ -453,13 +453,15 @@ AM_CONDITIONAL(ENABLE_OLDGNUTLS_INTEROP, test "$enable_oldgnutls_interop" != "no # check for libev - used in full test suite AC_LIB_HAVE_LINKFLAGS(ev,, [#include <ev.h>], [ev_run(0,0);]) if test "$ac_cv_libev" = yes; then - AC_SUBST([LIBEV_LIBS], [$LIBEV]) -elif test "$full_test_suite" = yes;then - AC_MSG_ERROR([[*** -*** libev4 was not found. -***]]) + AC_SUBST([LIBEV_LIBS], [$LIBEV]) +else + AC_MSG_WARN([[ +*** tests/suite/eagain.sh is disabled due to missing libev *** +]]) fi +AM_CONDITIONAL(HAVE_LIBEV, test "$ac_cv_libev" = "yes") + dnl GCC warnings to enable AC_ARG_ENABLE([gcc-warnings], diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am index 025f513f78..603771fa04 100644 --- a/tests/suite/Makefile.am +++ b/tests/suite/Makefile.am @@ -81,14 +81,16 @@ if !MACOSX if !WINDOWS mini_record_timing_LDADD = -lrt $(LDADD) nodist_mini_record_timing_SOURCES = mini-record-timing.c +noinst_PROGRAMS = mini-record-timing + +if HAVE_LIBEV eagain_cli_LDADD = $(LIBEV_LIBS) -lrt -lm $(LIBDL) -lpthread $(LDADD) nodist_eagain_cli_SOURCES = eagain-cli.c - -noinst_PROGRAMS = eagain-cli mini-record-timing - +noinst_PROGRAMS += eagain-cli scripts_to_test += eagain.sh endif endif +endif nodist_prime_check_SOURCES = prime-check.c nodist_rng_SOURCES = rng.c |