From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 74F093858D1E for ; Mon, 6 May 2024 20:45:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 74F093858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 74F093858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715028334; cv=none; b=l+uMzFHZZzweGreif5bn+PIbIDth1kqgo/HIGnzjzzVycJtnvtsm6O/OPpX4UsE85fF+HvKtl0fV3rxfdeGCwSxjVkYbAAkKKOqiWD+eou5ciPnfBQPFVcoLMpegz+F7DBYdPJ6pvAPeP8dHKUxbjb4g0OgMBmNssJEzpo1whjA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715028334; c=relaxed/simple; bh=Gl2rPUPJNDPvMrnWq8ebbatRCfG13JfpjSf+eMmYQx0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=L5ksgGHxv5iCc1RubwrlejiDcbNAv4KqMaYot4UUMT21oW9XN8mpBBXC9aY+L0Dpkvq0C5FEFG/glDomuneAdRyxp+3KzHgpf5zh6fZtHrP2H++PArrP6oPZnPJMnMuyqZ2t2OLyPklqxXCQaUBV8GLL+w3BhfA/VuOcjHPLK5M= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715028332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y4vpxms1oNwHfsJHcbHWwY2+oOETCd5ALudn4IRDoRo=; b=brS53x6mBej7fpjzJ7oxDtNd4b1cw7LEPlILF6ADBZSp47msGB2aEuAo2FmOAK+F5nFUf8 Dp6gP5PoP6SQ3a+B36Nji1PyN8dY/cpTKm3fd75EOWZ6Xn6a362AirDudzusj4T8wZjJB1 F7dm4LV+oxzX2PYlFrPxEmmOiRfRT2Q= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-340-Rm-qnI4uN7-FmpsO0PTl8A-1; Mon, 06 May 2024 16:45:30 -0400 X-MC-Unique: Rm-qnI4uN7-FmpsO0PTl8A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 254F03C000A1 for ; Mon, 6 May 2024 20:45:30 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.9.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5AD81C060D0; Mon, 6 May 2024 20:45:29 +0000 (UTC) From: Aaron Merey To: elfutils-devel@sourceware.org Cc: Aaron Merey Subject: [PATCH] Fix 'make coverage' when used with lcov version 2.0+ Date: Mon, 6 May 2024 16:45:27 -0400 Message-ID: <20240506204527.604074-1-amerey@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 --- Makefile.am | 30 +++++++++++++++++++++++++++++- configure.ac | 4 ++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c9d59d4a..a1f0b0c3 100644 --- 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 a279bb52..2aa728bd 100644 --- 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]), -- 2.43.0