diff options
| author | Mark Wielaard <mark@klomp.org> | 2022-06-02 17:36:39 +0200 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2022-06-02 17:36:42 +0200 |
| commit | 8cbadd86c147eeaec4344ac65ad00ea96ae1451a (patch) | |
| tree | 5491bf842522e8b71ed25e9cc6b043bf0368c661 | |
| parent | b8713b3fd0617415c76df8c9da70f8e2f26d3134 (diff) | |
| download | elfutils-8cbadd86c147eeaec4344ac65ad00ea96ae1451a.tar.gz | |
tests: Disable run-debuginfod-federation-metrics.sh for old libmicrohttpd
On really old libmicrohttpd the run-debuginfod-federation-metrics.sh
test will crash debuginfod after too many file descriptors have been
used. libmicrohttpd looses track of the state and aborts instead of
producing an error. Just disable the testcase on these very old versions.
Signed-off-by: Mark Wielaard <mark@klomp.org>
| -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 \ |