Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save vinniefalco/37014bcf2cf1a3bd1d419179b9b714db to your computer and use it in GitHub Desktop.
Save vinniefalco/37014bcf2cf1a3bd1d419179b9b714db to your computer and use it in GitHub Desktop.
From 3836c162c2864ed180df7d80fa03c70d17102edc Mon Sep 17 00:00:00 2001
From: Peter Oberparleiter <oberpapr@users.sourceforge.net>
Date: Tue, 13 Nov 2012 09:58:53 +0000
Subject: [PATCH] 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.
---
bin/geninfo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/geninfo b/bin/geninfo
index c306637..b587345 100755
--- a/bin/geninfo
+++ b/bin/geninfo
@@ -61,7 +61,7 @@ if( $^O eq "msys" )
}
# Constants
-our $lcov_version = 'LCOV version 1.11 pre (CVS $Revision: 1.117 $)';
+our $lcov_version = 'LCOV version 1.11 pre (CVS $Revision: 1.118 $)';
our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php";
our $gcov_tool = "gcov";
our $tool_name = basename($0);
@@ -1833,7 +1833,7 @@ sub read_gcov_file($)
push(@result, 0);
} else {
# Check for zero count
- if ($count eq "#####") {
+ if ($count =~ /^[#=]/) {
$count = 0;
}
push(@result, 1);
--
2.12.2.windows.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment