From 1306f27557e03fa6421dad6bee6c454c961f07d1 Mon Sep 17 00:00:00 2001 From: Henry Cox Date: Thu, 23 Jan 2025 08:24:02 -0500 Subject: [PATCH 1/3] Add location to error message. Signed-off-by: Henry Cox --- lib/lcovutil.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/lcovutil.pm b/lib/lcovutil.pm index 0010bec9..97b8b3c9 100644 --- a/lib/lcovutil.pm +++ b/lib/lcovutil.pm @@ -4676,9 +4676,10 @@ sub define_function $location = '"' . $self->filename() . '":' . $start_line unless defined($location); lcovutil::ignorable_error($lcovutil::ERROR_INCONSISTENT_DATA, - "$location: duplicate function '$fnName' starts on line $start_line but previous definition started on " - . $data->line() - . MessageContext::context() . '.') + "$location: duplicate function '$fnName' starts on line \"" . + $data->filename() . + "\":$start_line but previous definition started on " . + $data->line() . MessageContext::context() . '.') unless grep({ $fnName =~ $_ } @lcovutil::suppress_function_patterns); # if ignored, just return the function we already have - From 90b1068d0cbf565522a13d08d612b1c74bf348cb Mon Sep 17 00:00:00 2001 From: Henry Cox Date: Thu, 23 Jan 2025 08:24:23 -0500 Subject: [PATCH 2/3] Update default version ID Signed-off-by: Henry Cox --- bin/get_version.sh | 2 +- rpm/lcov.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/get_version.sh b/bin/get_version.sh index 9ff68337..e515231b 100755 --- a/bin/get_version.sh +++ b/bin/get_version.sh @@ -25,7 +25,7 @@ else fi # Fallback -[ -z "$VERSION" ] && VERSION="2.3" +[ -z "$VERSION" ] && VERSION="2.4" [ -z "$RELEASE" ] && RELEASE="beta" [ -z "$FULL" ] && FULL="$VERSION-$RELEASE" diff --git a/rpm/lcov.spec b/rpm/lcov.spec index 9dd3f32c..591cb163 100644 --- a/rpm/lcov.spec +++ b/rpm/lcov.spec @@ -1,6 +1,6 @@ Summary: A graphical code coverage front-end Name: lcov -Version: 2.3 +Version: 2.4 Release: 1 License: GPLv2+ Group: Development/Tools From 0da5d2fcf2a33b938ba5a6ab4f7d6137ff9ab310 Mon Sep 17 00:00:00 2001 From: Henry Cox Date: Thu, 23 Jan 2025 11:07:00 -0500 Subject: [PATCH 3/3] fix spelling Signed-off-by: Henry Cox --- man/genhtml.1 | 2 +- tests/lcov/extract/extract.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/genhtml.1 b/man/genhtml.1 index 9e3d9bc2..5dd5aab6 100644 --- a/man/genhtml.1 +++ b/man/genhtml.1 @@ -1022,7 +1022,7 @@ table entry to the first line in the corresponding file in the particular category - e.g., to the first 'MIS' line (vanilla coverage report - see the .i \-\-show\-navigation option, below), to -the first 'UNC' branch (differential coverage repot), etc. +the first 'UNC' branch (differential coverage report), etc. Hyperlinks from the summary table at the top of the 'source detail' page are not affected. .RE diff --git a/tests/lcov/extract/extract.sh b/tests/lcov/extract/extract.sh index e9047126..810eb441 100755 --- a/tests/lcov/extract/extract.sh +++ b/tests/lcov/extract/extract.sh @@ -429,7 +429,7 @@ if [ 0 != $? ] ; then fi -# workaround: depending on compiler verision, we see a coverpoint on the +# workaround: depending on compiler version, we see a coverpoint on the # close brace line (gcc/6 for example) or we don't (gcc/10 for example) BRACE_LINE='^DA:34' MARKER_LINES=`grep -v $BRACE_LINE internal.info | grep -c "^DA:"`