Fix 'make coverage' when used with lcov version 2.0+

Starting with version 2.0, various lcov warnings now trigger an error
exit.  This results in 'make coverage' terminating before completion.

Fix this by invoking lcov and genhtml with --ignore-errors to prevent
the error exit when version 2.0+ is in use.

Manually tested by running elfutils-htdocs/update-coverage.sh with
lcov 1.14 and 2.0.

Signed-off-by: Aaron Merey <amerey@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index c9d59d4aacc367c29189b05ba5d698479605fbe8..a1f0b0c36432ae320fbcfcfa5faf4195fd51eb78 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,6 +77,7 @@ coverage-clean:
 coverage: $(COVERAGE_OUTPUT_INDEX_HTML)
        @echo 'file://$(abs_builddir)/$(COVERAGE_OUTPUT_INDEX_HTML)'
 
+if LCOV_OLD
 $(COVERAGE_OUTPUT_INDEX_HTML): $(COVERAGE_OUTPUT_FILE)
        LC_ALL=C $(GENHTML) \
                --legend \
@@ -89,7 +90,23 @@ $(COVERAGE_OUTPUT_INDEX_HTML): $(COVERAGE_OUTPUT_FILE)
                --prefix='$(realpath $(abs_builddir)/..)' \
                --output-directory='$(COVERAGE_OUTPUT_DIRECTORY)' \
                $<
+else
+$(COVERAGE_OUTPUT_INDEX_HTML): $(COVERAGE_OUTPUT_FILE)
+       LC_ALL=C $(GENHTML) \
+               --legend \
+               --show-details \
+               --ignore-errors empty,negative \
+               --rc=genhtml_branch_coverage=1 \
+               --title='$(COVERAGE_TITLE)' \
+               --prefix='$(abspath $(abs_srcdir))' \
+               --prefix='$(realpath $(abs_srcdir))' \
+               --prefix='$(abspath $(abs_builddir)/..)' \
+               --prefix='$(realpath $(abs_builddir)/..)' \
+               --output-directory='$(COVERAGE_OUTPUT_DIRECTORY)' \
+               $<
+endif
 
+if LCOV_OLD
 $(COVERAGE_OUTPUT_FILE):
        $(LCOV) \
                --capture \
@@ -99,7 +116,18 @@ $(COVERAGE_OUTPUT_FILE):
                --gcov-tool='$(GCOV)' \
                --output-file='$@' \
                $(LCOV_DIRS_ARGS)
-
+else
+$(COVERAGE_OUTPUT_FILE):
+       $(LCOV) \
+               --capture \
+               --no-external \
+               --no-checksum \
+               --ignore-errors empty,negative \
+               --rc=lcov_branch_coverage=1 \
+               --gcov-tool='$(GCOV)' \
+               --output-file='$@' \
+               $(LCOV_DIRS_ARGS)
+endif
 endif
 
 # Tell version 3.79 and up of GNU make to not build goals in this

diff --git a/configure.ac b/configure.ac
index a279bb5282c900a6c0667a20f83e7222fbd2ad57..2aa728bd1b17be6ce64a91cdecdc29a8f290c75e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -322,6 +322,10 @@ if test "$use_gcov" = yes; then
 fi
 AM_CONDITIONAL(GCOV, test "$use_gcov" = yes)
 
+# Check if lcov/genhtml supports ignoring additional errors.
+AM_CONDITIONAL([LCOV_OLD],
+  [test "$LCOV" = "lcov" && lcov --version | grep -E -q "version 0|version 1"])
+
 AC_ARG_ENABLE([sanitize-undefined],
               AS_HELP_STRING([--enable-sanitize-undefined],
                              [Use gcc undefined behaviour sanitizer]),