Skip to content

Commit 3836c16

Browse files
Peter Oberparleiteroberpar
authored andcommitted
geninfo: fix parsing of gcc 4.7 gcov format
GCC 4.7 changes the gcov format for lines which can only be reached by exceptions to "=====" instead of "#####". This results in the following warning: geninfo: Argument "=====" isn't numeric in numeric gt (>) at geninfo line 1281. Fix this by handling "=====" correctly.
1 parent b932f94 commit 3836c16

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

bin/geninfo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if( $^O eq "msys" )
6161
}
6262

6363
# Constants
64-
our $lcov_version = 'LCOV version 1.11 pre (CVS $Revision: 1.117 $)';
64+
our $lcov_version = 'LCOV version 1.11 pre (CVS $Revision: 1.118 $)';
6565
our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php";
6666
our $gcov_tool = "gcov";
6767
our $tool_name = basename($0);
@@ -1833,7 +1833,7 @@ sub read_gcov_file($)
18331833
push(@result, 0);
18341834
} else {
18351835
# Check for zero count
1836-
if ($count eq "#####") {
1836+
if ($count =~ /^[#=]/) {
18371837
$count = 0;
18381838
}
18391839
push(@result, 1);

0 commit comments

Comments
 (0)