From: Peter O. <obe...@us...> - 2013-12-13 15:23:29
|
Update of /cvsroot/ltp/utils/analysis/lcov/bin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28084 Modified Files: geninfo Log Message: geninfo: make gcov tool version detection more robust Don't consider gcov tool version information in parenthesis when determining the gcov tool version. This fixes problems where the version string contains a different version number in parenthesis before the actual gcov version. Signed-off-by: Peter Oberparleiter <ob...@li...> Index: geninfo =================================================================== RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** geninfo 13 Dec 2013 15:09:57 -0000 1.124 --- geninfo 13 Dec 2013 15:23:27 -0000 1.125 *************** *** 1900,1903 **** --- 1900,1908 ---- close(GCOV_PIPE); + # Remove version information in parenthesis to cope with the following: + # - gcov (GCC) 4.4.7 20120313 (Red Hat 4.4.7-3) + # - gcov (crosstool-NG 1.18.0) 4.7.2 + $version_string =~ s/\([^\)]*\)//g; + $result = 0; if ($version_string =~ /(\d+)\.(\d+)(\.(\d+))?/) |