Skip to content

Improved error message, fix typos #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 23, 2025
Merged

Improved error message, fix typos #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1306f27
Add location to error message.
henry2cox Jan 23, 2025
90b1068
Update default version ID
henry2cox Jan 23, 2025
0da5d2f
fix spelling
henry2cox Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/get_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
7 changes: 4 additions & 3 deletions lib/lcovutil.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down
2 changes: 1 addition & 1 deletion man/genhtml.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rpm/lcov.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/lcov/extract/extract.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"`
Expand Down