[Ltp-cvs] utils/analysis/lcov/bin geninfo,1.85,1.86

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7537/bin

Modified Files:
	geninfo 
Log Message:
gcov: add configuration file option to not use gcov's -a option

lcov calls gcov while specifying its --all-blocks option to get more
detailed branch coverage data per line. It turns out that this option
is broken on many versions of gcov, resulting in an endless loop while
processing some gcov data files. There's also a slight performance
penalty when specifying -a.

lcov users can opt to not use the -a option by setting configuration
option geninfo_gcov_all_blocks to 0 in the lcovrc file.


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** geninfo	24 Aug 2010 16:15:53 -0000	1.85
--- geninfo	31 Aug 2010 08:17:23 -0000	1.86
***************
*** 187,190 ****
--- 187,191 ----
  our @internal_dirs;
  our $opt_config_file;
+ our $opt_gcov_all_blocks = 1;
  
  our $cwd = `pwd`;
***************
*** 234,237 ****
--- 235,239 ----
  		"geninfo_compat_libtool"	=> \$compat_libtool,
  		"geninfo_external"		=> \$opt_external,
+ 		"geninfo_gcov_all_blocks"	=> \$opt_gcov_all_blocks,
  	});
  
***************
*** 420,424 ****
  push(@gcov_options, "-b") if ($gcov_caps->{'branch-probabilities'});
  push(@gcov_options, "-c") if ($gcov_caps->{'branch-counts'});
! push(@gcov_options, "-a") if ($gcov_caps->{'all-blocks'});
  push(@gcov_options, "-p") if ($gcov_caps->{'preserve-paths'});
  
--- 422,427 ----
  push(@gcov_options, "-b") if ($gcov_caps->{'branch-probabilities'});
  push(@gcov_options, "-c") if ($gcov_caps->{'branch-counts'});
! push(@gcov_options, "-a") if ($gcov_caps->{'all-blocks'} &&
! 			      $opt_gcov_all_blocks);
  push(@gcov_options, "-p") if ($gcov_caps->{'preserve-paths'});