diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 |
4 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2022-06-02 Mark Wielaard <mark@klomp.org> + + * configure.ac (OLD_LIBMICROHTTPD): New AM_CONDITIONAL based on + libmicrohttpd < 0.9.51. + 2022-05-02 Mark Wielaard <mark@klomp.org> * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Remove diff --git a/configure.ac b/configure.ac index 11d1cf82..03b67a9d 100644 --- a/configure.ac +++ b/configure.ac @@ -783,6 +783,7 @@ AS_IF([test "x$enable_debuginfod" != "xno"], [ enable_debuginfod=yes # presume success PKG_PROG_PKG_CONFIG PKG_CHECK_MODULES([libmicrohttpd],[libmicrohttpd >= 0.9.33],[],[enable_debuginfod=no]) + PKG_CHECK_MODULES([oldlibmicrohttpd],[libmicrohttpd < 0.9.51],[old_libmicrohttpd=yes],[old_libmicrohttpd=no]) PKG_CHECK_MODULES([sqlite3],[sqlite3 >= 3.7.17],[],[enable_debuginfod=no]) PKG_CHECK_MODULES([libarchive],[libarchive >= 3.1.2],[],[enable_debuginfod=no]) if test "x$enable_debuginfod" = "xno"; then @@ -792,6 +793,7 @@ AS_IF([test "x$enable_debuginfod" != "xno"], [ AS_IF([test "x$enable_debuginfod" != "xno"],AC_DEFINE([ENABLE_DEBUGINFOD],[1],[Build debuginfod])) AM_CONDITIONAL([DEBUGINFOD],[test "x$enable_debuginfod" = "xyes"]) +AM_CONDITIONAL([OLD_LIBMICROHTTPD],[test "x$old_libmicrohttpd" = "xyes"]) dnl for /etc/profile.d/elfutils.{csh,sh} default_debuginfod_urls="" diff --git a/tests/ChangeLog b/tests/ChangeLog index 44b8df88..fb956925 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2022-06-02 Mark Wielaard <mark@klomp.org> + + * Makefile.am (TESTS): Add run-debuginfod-federation-metrics.sh + only when OLD_LIBMICROHTTPD conditional is not set. + 2022-04-24 Mark Wielaard <mark@klomp.org> * run-debuginfod-webapi-concurrency.sh: Fix PR number in xfail. diff --git a/tests/Makefile.am b/tests/Makefile.am index 84c3950a..d30b07c4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -238,13 +238,17 @@ TESTS += run-debuginfod-dlopen.sh \ run-debuginfod-archive-test.sh \ run-debuginfod-federation-sqlite.sh \ run-debuginfod-federation-link.sh \ - run-debuginfod-federation-metrics.sh \ run-debuginfod-percent-escape.sh \ run-debuginfod-x-forwarded-for.sh \ run-debuginfod-response-headers.sh \ run-debuginfod-extraction-passive.sh \ run-debuginfod-webapi-concurrency.sh endif +if !OLD_LIBMICROHTTPD +# Will crash on too old libmicrohttpd +# Too many open file descriptors confuses libmicrohttpd < 0.9.51 +TESTS += run-debuginfod-federation-metrics.sh +endif endif EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \ |