ltp-cvs — LTP CVS Commits

[Ltp-cvs] utils/analysis/lcov/bin geninfo,1.87,1.88

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

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

Modified Files:
	geninfo 
Log Message:
geninfo: apply exclusion marker to derived function data

When option --derive-func-data is used together with exclusion markers,
function data for excluded lines is still included. Fix this by
only deriving function data for lines which are instrumented and not
excluded.

Reported by: be...@gm...


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** geninfo	31 Aug 2010 08:19:03 -0000	1.87
--- geninfo	28 Oct 2010 14:16:34 -0000	1.88
***************
*** 650,653 ****
--- 650,654 ----
  		my $line_data = $bbdata->{$fn};
  		my $line;
+ 		my $fninstr = 0;
  
  		if ($fn eq "") {
***************
*** 657,662 ****
--- 658,666 ----
  		$count = 0;
  		foreach $line (@$line_data) {
+ 			my $linstr = $gcov_content[ ( $line - 1 ) * 3 + 0 ];
  			my $lcount = $gcov_content[ ( $line - 1 ) * 3 + 1 ];
  
+ 			next if (!$linstr);
+ 			$fninstr = 1;
  			if (($lcount > 0) &&
  			    (($count == 0) || ($lcount < $count))) {
***************
*** 664,667 ****
--- 668,672 ----
  			}
  		}
+ 		next if (!$fninstr);
  		$fn_count{$fn} = $count;
  	}

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

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

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

Modified Files:
	geninfo 
Log Message:
geninfo: improve --debug output


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** geninfo	31 Aug 2010 08:17:23 -0000	1.86
--- geninfo	31 Aug 2010 08:19:03 -0000	1.87
***************
*** 1794,1797 ****
--- 1794,1798 ----
  	($mode & 2) && open(STDERR, ">/dev/null");
   
+ 	debug("system(".join(' ', @_).")\n");
  	system(@_);
  	$result = $?;

[Ltp-cvs] utils/analysis/lcov/man lcovrc.5,1.17,1.18

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

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

Modified Files:
	lcovrc.5 
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: lcovrc.5
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcovrc.5,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** lcovrc.5	23 Aug 2010 14:47:43 -0000	1.17
--- lcovrc.5	31 Aug 2010 08:17:23 -0000	1.18
***************
*** 170,173 ****
--- 170,185 ----
  .br
  
+ # Specify whether to capture coverage data for external source
+ .br
+ # files
+ .br
+ #geninfo_external = 1
+ .br
+ 
+ # Use gcov's --all-blocks option if non-zero
+ .br
+ #geninfo_gcov_all_blocks = 1
+ .br
+ 
  # Directory containing gcov kernel files
  .br
***************
*** 200,209 ****
  lcov_list_truncate_max = 20
  
- # Specify whether to capture coverage data for external source
- .br
- # files
- .br
- geninfo_external = 1
- .br
  .PP
  
--- 212,215 ----
***************
*** 572,575 ****
--- 578,594 ----
  .PP
  
+ .BR geninfo_gcov_all_blocks " ="
+ .IR 0 | 1
+ .IP
+ If non\-zero, call the gcov tool with option --all-blocks.
+ 
+ Using --all-blocks will produce more detailed branch coverage information for
+ each line. Set this option to zero if you do not need detailed branch coverage
+ information to speed up the process of capturing code coverage or to work
+ around a bug in some versions of gcov which will cause it to endlessly loop
+ when analysing some files.
+ 
+ Default is 1.
+ .PP
  
  .BR lcov_gcov_dir " ="

[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'});
  

[Ltp-cvs] utils/analysis/lcov lcovrc,1.15,1.16

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

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

Modified Files:
	lcovrc 
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: lcovrc
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/lcovrc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** lcovrc	23 Aug 2010 14:47:38 -0000	1.15
--- lcovrc	31 Aug 2010 08:17:23 -0000	1.16
***************
*** 101,108 ****
--- 101,115 ----
  #geninfo_checksum = 1
  
+ # Specify whether to capture coverage data for external source files (can
+ # be overridden by the --external and --no-external options of geninfo/lcov)
+ #geninfo_external = 1
+ 
  # Enable libtool compatibility mode if non-zero (same as --compat-libtool option
  # of geninfo if non-zero, same as --no-compat-libtool if zero)
  #geninfo_compat_libtool = 0
  
+ # Use gcov's --all-blocks option if non-zero
+ #geninfo_gcov_all_blocks = 1
+ 
  # Directory containing gcov kernel files
  # lcov_gcov_dir = /proc/gcov
***************
*** 132,137 ****
  # lcov_list_full_path is non-zero.
  lcov_list_truncate_max = 20
- 
- # Specify whether to capture coverage data for external source files (can
- # be overridden by the --external and --no-external options of geninfo/lcov)
- geninfo_external = 1
--- 139,140 ----

[Ltp-cvs] LTP CVS

[Sriranjan <sri...@gm...>]

  Hello Everyone,

I try to download the LTP via cvs command as given in LTP site

cvs -d:pserver:ano...@lt...<d%3Apserver%3Aa...@lt...>
:/cvsroot/ltp login

But when I see the status the repository what I got is  six month old
repository (15 Feb 2010)
even the web interface

*http://ltp.cvs.sourceforge.net/viewvc/ltp/ltp/?sortby=file#dirlist*<http://ltp.cvs.sourceforge.net/viewvc/ltp/ltp/?sortby=file#dirlist>

shows 6 month old repository



I needed latest repository of 20100630 (*JUNE 2010
STABLE*<https://sourceforge.net/projects/ltp/files/LTP%20Source/ltp-20100630/ltp-full-20100630.bz2/download>).


Please help me out in getting the latest repository



Best regards

Sriranjan

[Ltp-cvs] utils/analysis/lcov/man genhtml.1, 1.21, 1.22 geninfo.1, 1.18, 1.19 lcov.1, 1.24, 1.25

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

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

Modified Files:
	genhtml.1 geninfo.1 lcov.1 
Log Message:
lcov: add option to specify a configuration file

Provide an option for users to specify a configuration file to lcov.
This option may be useful when there is a need to run several instances
of a tool with different configuration file options in parallel.


Index: genhtml.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/genhtml.1,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** genhtml.1	20 Aug 2010 13:14:50 -0000	1.21
--- genhtml.1	24 Aug 2010 16:15:53 -0000	1.22
***************
*** 60,63 ****
--- 60,66 ----
  .IR errors  ]
  .br
+ .RB [ \-\-config\-file
+ .IR config\-file ]
+ .br
  .IR tracefile(s)
  .RE
***************
*** 499,502 ****
--- 502,520 ----
  .RE
  
+ .B \-\-config\-file
+ .I config\-file
+ .br
+ .RS
+ Specify a configuration file to use.
+ 
+ When this option is specified, neither the system\-wide configuration file
+ /etc/lcovrc, nor the per\-user configuration file ~/.lcovrc is read.
+ 
+ This option may be useful when there is a need to run several
+ instances of
+ .B genhtml
+ with different configuration file options in parallel.
+ .RE
+ 
  .SH FILES
  

Index: geninfo.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/geninfo.1,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** geninfo.1	23 Aug 2010 14:47:43 -0000	1.18
--- geninfo.1	24 Aug 2010 16:15:53 -0000	1.19
***************
*** 35,38 ****
--- 35,41 ----
  .RB [ \-\-external ]
  .RB [ \-\-no\-external ]
+ .br
+ .RB [ \-\-config\-file
+ .IR config\-file ]
  .RE
  .SH DESCRIPTION
***************
*** 162,165 ****
--- 165,183 ----
  .RE
  
+ .B \-\-config\-file
+ .I config\-file
+ .br
+ .RS
+ Specify a configuration file to use.
+ 
+ When this option is specified, neither the system\-wide configuration file
+ /etc/lcovrc, nor the per\-user configuration file ~/.lcovrc is read.
+ 
+ This option may be useful when there is a need to run several
+ instances of
+ .B geninfo
+ with different configuration file options in parallel.
+ .RE
+ 
  .B \-\-external
  .br

Index: lcov.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcov.1,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** lcov.1	23 Aug 2010 16:14:37 -0000	1.24
--- lcov.1	24 Aug 2010 16:15:53 -0000	1.25
***************
*** 43,46 ****
--- 43,49 ----
  .RB [ \-\-no\-external ]
  .br
+ .RB [ \-\-config\-file
+ .IR config\-file ]
+ .br
  .RE
  
***************
*** 67,70 ****
--- 70,76 ----
  .RB [ \-\-no\-list\-full\-path ]
  .br
+ .RB [ \-\-config\-file
+ .IR config\-file ]
+ .br
  .RE
  
***************
*** 80,83 ****
--- 86,91 ----
  .br
  .RB [ \-q | \-\-quiet ]
+ .RB [ \-\-config\-file
+ .IR config\-file ]
  .br
  .RE
***************
*** 94,97 ****
--- 102,108 ----
  .br
  .RB [ \-q | \-\-quiet ]
+ .RB [ \-\-config\-file
+ .IR config\-file ]
+ .br
  .RE
  
***************
*** 107,110 ****
--- 118,123 ----
  .br
  .RB [ \-q | \-\-quiet ]
+ .RB [ \-\-config\-file
+ .IR config\-file ]
  .br
  .RE
***************
*** 127,130 ****
--- 140,146 ----
  .RB [ \-q | \-\-quiet ]
  .br
+ .RB [ \-\-config\-file
+ .IR config\-file ]
+ .br
  .RE
  
***************
*** 294,297 ****
--- 310,328 ----
  .RE
  
+ .B \-\-config\-file
+ .I config\-file
+ .br
+ .RS
+ Specify a configuration file to use.
+ 
+ When this option is specified, neither the system\-wide configuration file
+ /etc/lcovrc, nor the per\-user configuration file ~/.lcovrc is read.
+ 
+ This option may be useful when there is a need to run several
+ instances of
+ .B lcov
+ with different configuration file options in parallel.
+ .RE
+ 
  .B \-\-convert\-filenames
  .br

[Ltp-cvs] utils/analysis/lcov/bin genhtml, 1.55, 1.56 geninfo, 1.84, 1.85 lcov, 1.78, 1.79

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

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

Modified Files:
	genhtml geninfo lcov 
Log Message:
lcov: add option to specify a configuration file

Provide an option for users to specify a configuration file to lcov.
This option may be useful when there is a need to run several instances
of a tool with different configuration file options in parallel.


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** geninfo	23 Aug 2010 14:47:38 -0000	1.84
--- geninfo	24 Aug 2010 16:15:53 -0000	1.85
***************
*** 186,189 ****
--- 186,190 ----
  our @gcov_options;
  our @internal_dirs;
+ our $opt_config_file;
  
  our $cwd = `pwd`;
***************
*** 206,211 ****
  $ENV{"LANG"} = "C";
  
  # Read configuration file if available
! if (defined($ENV{"HOME"}) && (-r $ENV{"HOME"}."/.lcovrc"))
  {
  	$config = read_config($ENV{"HOME"}."/.lcovrc");
--- 207,219 ----
  $ENV{"LANG"} = "C";
  
+ # Check command line for a configuration file name
+ Getopt::Long::Configure("pass_through", "no_auto_abbrev");
+ GetOptions("config-file:s" => \$opt_config_file);
+ Getopt::Long::Configure("default");
+ 
  # Read configuration file if available
! if (defined($opt_config_file)) {
! 	$config = read_config($opt_config_file);
! } elsif (defined($ENV{"HOME"}) && (-r $ENV{"HOME"}."/.lcovrc"))
  {
  	$config = read_config($ENV{"HOME"}."/.lcovrc");
***************
*** 488,491 ****
--- 496,500 ----
        --derive-func-data            Generate function data from line data
        --(no-)external               Include (ignore) data for external files
+       --config-file FILENAME        Specify configuration file location
  
  For more information see: $lcov_url

Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** genhtml	20 Aug 2010 14:31:59 -0000	1.55
--- genhtml	24 Aug 2010 16:15:53 -0000	1.56
***************
*** 289,292 ****
--- 289,293 ----
  our @opt_ignore_errors;	# Ignore certain error classes during processing
  our @ignore;
+ our $opt_config_file;	# User-specified configuration file location
  our $charset = "UTF-8";	# Default charset for HTML pages
  our @fileview_sortlist;
***************
*** 317,322 ****
  }
  
  # Read configuration file if available
! if (defined($ENV{"HOME"}) && (-r $ENV{"HOME"}."/.lcovrc"))
  {
  	$config = read_config($ENV{"HOME"}."/.lcovrc");
--- 318,330 ----
  }
  
+ # Check command line for a configuration file name
+ Getopt::Long::Configure("pass_through", "no_auto_abbrev");
+ GetOptions("config-file:s" => \$opt_config_file);
+ Getopt::Long::Configure("default");
+ 
  # Read configuration file if available
! if (defined($opt_config_file)) {
! 	$config = read_config($opt_config_file);
! } elsif (defined($ENV{"HOME"}) && (-r $ENV{"HOME"}."/.lcovrc"))
  {
  	$config = read_config($ENV{"HOME"}."/.lcovrc");
***************
*** 557,560 ****
--- 565,570 ----
    -v, --version                     Print version number, then exit
    -q, --quiet                       Do not print progress messages
+       --config-file FILENAME        Specify configuration file location
+       --ignore-errors ERRORS        Continue after ERRORS (source)
  
  Operation:
***************
*** 583,587 ****
        --(no-)sort                   Enable (disable) sorted coverage views
        --demangle-cpp                Demangle C++ function names
-       --ignore-errors ERRORS        Continue after ERRORS (source)
  
  For more information see: $lcov_url
--- 593,596 ----

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** lcov	23 Aug 2010 16:14:37 -0000	1.78
--- lcov	24 Aug 2010 16:15:53 -0000	1.79
***************
*** 190,193 ****
--- 190,194 ----
  our $opt_external;
  our $opt_no_external;
+ our $opt_config_file;
  our @opt_summary;
  our $ln_overall_found;
***************
*** 217,222 ****
  }
  
  # Read configuration file if available
! if (defined($ENV{"HOME"}) && (-r $ENV{"HOME"}."/.lcovrc"))
  {
  	$config = read_config($ENV{"HOME"}."/.lcovrc");
--- 218,230 ----
  }
  
+ # Check command line for a configuration file name
+ Getopt::Long::Configure("pass_through", "no_auto_abbrev");
+ GetOptions("config-file:s" => \$opt_config_file);
+ Getopt::Long::Configure("default");
+ 
  # Read configuration file if available
! if (defined($opt_config_file)) {
! 	$config = read_config($opt_config_file);
! } elsif (defined($ENV{"HOME"}) && (-r $ENV{"HOME"}."/.lcovrc"))
  {
  	$config = read_config($ENV{"HOME"}."/.lcovrc");
***************
*** 514,517 ****
--- 522,526 ----
        --list-full-path            Print full path during a list operation
        --(no-)external             Include (ignore) data for external files
+       --config-file FILENAME      Specify configuration file location
  
  For more information see: $lcov_url

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.77,1.78

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

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

Modified Files:
	lcov 
Log Message:
lcov: add option to display summary coverage information

Provide an option for users to determine the summary coverage information
of one or more tracefiles. Example output:

Summary coverage rate:
  lines......: 26.0% (78132 of 300355 lines)
  functions..: 34.9% (8413 of 24081 functions)
  branches...: 16.9% (32610 of 193495 branches)


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** lcov	23 Aug 2010 14:47:40 -0000	1.77
--- lcov	23 Aug 2010 16:14:37 -0000	1.78
***************
*** 140,143 ****
--- 140,144 ----
  sub get_func_found_and_hit($);
  sub br_ivec_get($$);
+ sub summary();
  
  # Global variables & initialization
***************
*** 189,192 ****
--- 190,194 ----
  our $opt_external;
  our $opt_no_external;
+ our @opt_summary;
  our $ln_overall_found;
  our $ln_overall_hit;
***************
*** 274,277 ****
--- 276,280 ----
  		"external" => \$opt_external,
  		"no-external" => \$opt_no_external,
+ 		"summary=s" => \@opt_summary,
  		))
  {
***************
*** 351,355 ****
  
  # Only --extract, --remove and --diff allow unnamed parameters
! if (@ARGV && !($extract || $remove || $diff))
  {
  	die("Extra parameter found: '".join(" ", @ARGV)."'\n".
--- 354,358 ----
  
  # Only --extract, --remove and --diff allow unnamed parameters
! if (@ARGV && !($extract || $remove || $diff || @opt_summary))
  {
  	die("Extra parameter found: '".join(" ", @ARGV)."'\n".
***************
*** 439,442 ****
--- 442,451 ----
  	 $br_overall_found, $br_overall_hit) = diff();
  }
+ elsif (@opt_summary)
+ {
+ 	($ln_overall_found, $ln_overall_hit,
+ 	 $fn_overall_found, $fn_overall_hit,
+ 	 $br_overall_found, $br_overall_hit) = summary();
+ }
  
  temp_cleanup();
***************
*** 481,484 ****
--- 490,494 ----
    -l, --list FILE                 List contents of tracefile FILE
        --diff FILE DIFF            Transform tracefile FILE according to DIFF
+       --summary FILE              Show summary coverage data for tracefiles
  
  Options:
***************
*** 529,543 ****
  	$list && $i++;
  	$diff && $i++;
  	
  	if ($i == 0)
  	{
! 		die("Need one of the options -z, -c, -a, -e, -r, -l or ".
! 		    "--diff\n".
  		    "Use $tool_name --help to get usage information\n");
  	}
  	elsif ($i > 1)
  	{
! 		die("ERROR: only one of -z, -c, -a, -e, -r, -l or ".
! 		    "--diff allowed!\n".
  		    "Use $tool_name --help to get usage information\n");
  	}
--- 539,554 ----
  	$list && $i++;
  	$diff && $i++;
+ 	@opt_summary && $i++;
  	
  	if ($i == 0)
  	{
! 		die("Need one of options -z, -c, -a, -e, -r, -l, ".
! 		    "--diff or --summary\n".
  		    "Use $tool_name --help to get usage information\n");
  	}
  	elsif ($i > 1)
  	{
! 		die("ERROR: only one of -z, -c, -a, -e, -r, -l, ".
! 		    "--diff or --summary allowed!\n".
  		    "Use $tool_name --help to get usage information\n");
  	}
***************
*** 3920,3923 ****
--- 3931,3987 ----
  }
  
+ #
+ # summary()
+ #
+ 
+ sub summary()
+ {
+ 	my $filename;
+ 	my $current;
+ 	my $total;
+ 	my $ln_total_found;
+ 	my $ln_total_hit;
+ 	my $fn_total_found;
+ 	my $fn_total_hit;
+ 	my $br_total_found;
+ 	my $br_total_hit;
+ 
+ 	# Read and combine trace files
+ 	foreach $filename (@opt_summary) {
+ 		$current = read_info_file($filename);
+ 		if (!defined($total)) {
+ 			$total = $current;
+ 		} else {
+ 			$total = combine_info_files($total, $current);
+ 		}
+ 	}
+ 	# Calculate coverage data
+ 	foreach $filename (keys(%{$total}))
+ 	{
+ 		my $entry = $total->{$filename};
+ 		my $ln_found;
+ 		my $ln_hit;
+ 		my $fn_found;
+ 		my $fn_hit;
+ 		my $br_found;
+ 		my $br_hit;
+ 
+ 		(undef, undef, undef, undef, undef, undef, undef, undef,
+ 			$ln_found, $ln_hit, $fn_found, $fn_hit, $br_found,
+ 			$br_hit) = get_info_entry($entry);
+ 
+ 		# Add to totals
+ 		$ln_total_found	+= $ln_found;
+ 		$ln_total_hit	+= $ln_hit;
+ 		$fn_total_found += $fn_found;
+ 		$fn_total_hit	+= $fn_hit;
+ 		$br_total_found += $br_found;
+ 		$br_total_hit	+= $br_hit;
+ 	}
+ 
+ 
+ 	return ($ln_total_found, $ln_total_hit, $fn_total_found, $fn_total_hit,
+ 		$br_total_found, $br_total_hit);
+ }
  
  #
***************
*** 4183,4187 ****
  	    $br_do, $br_found, $br_hit) = @_;
  
! 	info("Overall coverage rate:\n");
  	info("  lines......: %s\n",
  	     get_overall_line($ln_found, $ln_hit, "line", "lines"))
--- 4247,4251 ----
  	    $br_do, $br_found, $br_hit) = @_;
  
! 	info("Summary coverage rate:\n");
  	info("  lines......: %s\n",
  	     get_overall_line($ln_found, $ln_hit, "line", "lines"))

[Ltp-cvs] utils/analysis/lcov/man lcov.1,1.23,1.24

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

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

Modified Files:
	lcov.1 
Log Message:
lcov: add option to display summary coverage information

Provide an option for users to determine the summary coverage information
of one or more tracefiles. Example output:

Summary coverage rate:
  lines......: 26.0% (78132 of 300355 lines)
  functions..: 34.9% (8413 of 24081 functions)
  branches...: 16.9% (32610 of 193495 branches)


Index: lcov.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcov.1,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** lcov.1	23 Aug 2010 14:47:43 -0000	1.23
--- lcov.1	23 Aug 2010 16:14:37 -0000	1.24
***************
*** 130,133 ****
--- 130,142 ----
  
  .B lcov
+ .BR \-\-summary
+ .I tracefile
+ .RS 5
+ .br
+ .RB [ \-q | \-\-quiet ]
+ .br
+ .RE
+ 
+ .B lcov
  .RB [ \-h | \-\-help ]
  .RB [ \-v | \-\-version ]
***************
*** 189,194 ****
  specified with \-o.
  
! Only one of \-z, \-c, \-a, \-e, \-r, \-l and \-\-diff may be specified
! at a time.
  
  .RE
--- 198,203 ----
  specified with \-o.
  
! Only one of  \-z, \-c, \-a, \-e, \-r, \-l, \-\-diff or \-\-summary may be
! specified at a time.
  
  .RE
***************
*** 240,245 ****
  specified with \-o.
  
! Only one of \-z, \-c, \-a, \-e, \-r, \-l and \-\-diff may be specified
! at a time.
  .RE
  
--- 249,254 ----
  specified with \-o.
  
! Only one of  \-z, \-c, \-a, \-e, \-r, \-l, \-\-diff or \-\-summary may be
! specified at a time.
  .RE
  
***************
*** 326,331 ****
  specified with \-o.
  
! Only one of \-z, \-c, \-a, \-e, \-r, \-l and \-\-diff may be specified
! at a time.
  .RE
  
--- 335,340 ----
  specified with \-o.
  
! Only one of  \-z, \-c, \-a, \-e, \-r, \-l, \-\-diff or \-\-summary may be
! specified at a time.
  .RE
  
***************
*** 388,393 ****
  specified with \-o.
  
! Only one of \-z, \-c, \-a, \-e, \-r, \-l and \-\-diff may be specified
! at a time.
  .RE
  
--- 397,402 ----
  specified with \-o.
  
! Only one of  \-z, \-c, \-a, \-e, \-r, \-l, \-\-diff or \-\-summary may be
! specified at a time.
  .RE
  
***************
*** 516,521 ****
  .IR tracefile .
  
! Only one of  \-z, \-c, \-a, \-e, \-r, \-l and \-\-diff may be specified
! at a time.
  .RE
  
--- 525,530 ----
  .IR tracefile .
  
! Only one of  \-z, \-c, \-a, \-e, \-r, \-l, \-\-diff or \-\-summary may be
! specified at a time.
  .RE
  
***************
*** 566,569 ****
--- 575,590 ----
  .RE
  
+ .B \-\-summary
+ .I tracefile
+ .br
+ .RS
+ Show summary coverage information for the specified tracefile.
+ 
+ Note that you may specify this option more than once.
+ 
+ Only one of  \-z, \-c, \-a, \-e, \-r, \-l, \-\-diff or \-\-summary may be
+ specified at a time.
+ .RE
+ 
  .B \-\-path
  .I path
***************
*** 611,616 ****
  specified with \-o.
  
! Only one of \-z, \-c, \-a, \-e, \-r, \-l and \-\-diff may be specified
! at a time.
  .RE
  
--- 632,637 ----
  specified with \-o.
  
! Only one of  \-z, \-c, \-a, \-e, \-r, \-l, \-\-diff or \-\-summary may be
! specified at a time.
  .RE
  
***************
*** 699,704 ****
  option to reset all counters of a user space program.
  
! Only one of \-z, \-c, \-a, \-e, \-r, \-l and \-\-diff may be specified
! at a time.
  .RE
  
--- 720,725 ----
  option to reset all counters of a user space program.
  
! Only one of  \-z, \-c, \-a, \-e, \-r, \-l, \-\-diff or \-\-summary may be
! specified at a time.
  .RE
  

[Ltp-cvs] utils/analysis/lcov lcovrc,1.14,1.15

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

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

Modified Files:
	lcovrc 
Log Message:
lcov: add option to exclude external files

Implement an option for users to specify that external source files should
be excluded when capturing coverage data. External source files are files
which are not located in the directories specified by the --directory and
--base-directory options of lcov/geninfo.


Index: lcovrc
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/lcovrc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** lcovrc	20 Aug 2010 14:27:19 -0000	1.14
--- lcovrc	23 Aug 2010 14:47:38 -0000	1.15
***************
*** 132,133 ****
--- 132,137 ----
  # lcov_list_full_path is non-zero.
  lcov_list_truncate_max = 20
+ 
+ # Specify whether to capture coverage data for external source files (can
+ # be overridden by the --external and --no-external options of geninfo/lcov)
+ geninfo_external = 1

[Ltp-cvs] utils/analysis/lcov/example Makefile,1.4,1.5

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

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

Modified Files:
	Makefile 
Log Message:
lcov: add option to exclude external files

Implement an option for users to specify that external source files should
be excluded when capturing coverage data. External source files are files
which are not located in the directories specified by the --directory and
--base-directory options of lcov/geninfo.


Index: Makefile
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/example/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	7 Jun 2006 09:20:37 -0000	1.4
--- Makefile	23 Aug 2010 14:47:43 -0000	1.5
***************
*** 71,75 ****
  	$(LCOV) --zerocounters --directory .
  	./example
! 	$(LCOV) --capture --directory . --output-file trace_noargs.info --test-name test_noargs
  
  test_2_to_2000:
--- 71,75 ----
  	$(LCOV) --zerocounters --directory .
  	./example
! 	$(LCOV) --capture --directory . --output-file trace_noargs.info --test-name test_noargs --no-external
  
  test_2_to_2000:
***************
*** 81,85 ****
  	$(LCOV) --zerocounters --directory .
  	./example 2 2000
! 	$(LCOV) --capture --directory . --output-file trace_args.info --test-name test_2_to_2000
  
  test_overflow:
--- 81,85 ----
  	$(LCOV) --zerocounters --directory .
  	./example 2 2000
! 	$(LCOV) --capture --directory . --output-file trace_args.info --test-name test_2_to_2000 --no-external
  
  test_overflow:
***************
*** 91,95 ****
  	$(LCOV) --zerocounters --directory .
  	./example 0 100000 || true
! 	$(LCOV) --capture --directory . --output-file trace_overflow.info --test-name "test_overflow"
  
  clean:
--- 91,95 ----
  	$(LCOV) --zerocounters --directory .
  	./example 0 100000 || true
! 	$(LCOV) --capture --directory . --output-file trace_overflow.info --test-name "test_overflow" --no-external
  
  clean:

[Ltp-cvs] utils/analysis/lcov/bin geninfo, 1.83, 1.84 lcov, 1.76, 1.77

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

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

Modified Files:
	geninfo lcov 
Log Message:
lcov: add option to exclude external files

Implement an option for users to specify that external source files should
be excluded when capturing coverage data. External source files are files
which are not located in the directories specified by the --directory and
--base-directory options of lcov/geninfo.


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** geninfo	20 Aug 2010 13:08:24 -0000	1.83
--- geninfo	23 Aug 2010 14:47:38 -0000	1.84
***************
*** 150,153 ****
--- 150,154 ----
  sub int_handler();
  sub parse_ignore_errors(@);
+ sub is_external($);
  
  
***************
*** 179,185 ****
--- 180,189 ----
  our $no_markers = 0;
  our $opt_derive_func_data = 0;
+ our $opt_external = 1;
+ our $opt_no_external;
  our $debug = 0;
  our $gcov_caps;
  our @gcov_options;
+ our @internal_dirs;
  
  our $cwd = `pwd`;
***************
*** 220,224 ****
  		"geninfo_checksum"		=> \$checksum,
  		"geninfo_no_checksum"		=> \$no_checksum, # deprecated
! 		"geninfo_compat_libtool"	=> \$compat_libtool});
  
  	# Merge options
--- 224,230 ----
  		"geninfo_checksum"		=> \$checksum,
  		"geninfo_no_checksum"		=> \$no_checksum, # deprecated
! 		"geninfo_compat_libtool"	=> \$compat_libtool,
! 		"geninfo_external"		=> \$opt_external,
! 	});
  
  	# Merge options
***************
*** 249,252 ****
--- 255,260 ----
  		"derive-func-data" => \$opt_derive_func_data,
  		"debug" => \$debug,
+ 		"external" => \$opt_external,
+ 		"no-external" => \$opt_no_external,
  		))
  {
***************
*** 268,271 ****
--- 276,284 ----
  		$no_compat_libtool = undef;
  	}
+ 
+ 	if (defined($opt_no_external)) {
+ 		$opt_external = 0;
+ 		$opt_no_external = undef;
+ 	}
  }
  
***************
*** 420,423 ****
--- 433,442 ----
  }
  
+ # Build list of directories to identify external files
+ foreach my $entry(@data_directory, $base_directory) {
+ 	next if (!defined($entry));
+ 	push(@internal_dirs, solve_relative_path($cwd, $entry));
+ }
+ 
  # Do something
  foreach my $entry (@data_directory) {
***************
*** 468,471 ****
--- 487,491 ----
        --no-markers                  Ignore exclusion markers in source code
        --derive-func-data            Generate function data from line data
+       --(no-)external               Include (ignore) data for external files
  
  For more information see: $lcov_url
***************
*** 989,992 ****
--- 1009,1022 ----
  		}
  
+ 		# Skip external files if requested
+ 		if (!$opt_external) {
+ 			if (is_external($source_filename)) {
+ 				info("  ignoring data for external file ".
+ 				     "$source_filename\n");
+ 				unlink($gcov_file);
+ 				next;
+ 			}
+ 		}
+ 
  		# Write absolute path of source file
  		printf(INFO_HANDLE "SF:%s\n", $source_filename);
***************
*** 1167,1170 ****
--- 1197,1204 ----
  	# Remove .
  	$result =~ s/\/\.\//\//g;
+ 	$result =~ s/\/\.$/\//g;
+ 
+ 	# Remove trailing /
+ 	$result =~ s/\/$//g;
  
  	# Solve ..
***************
*** 3086,3087 ****
--- 3120,3138 ----
  	}
  }
+ 
+ #
+ # is_external(filename)
+ #
+ # Determine if a file is located outside of the specified data directories.
+ #
+ 
+ sub is_external($)
+ {
+ 	my ($filename) = @_;
+ 	my $dir;
+ 
+ 	foreach $dir (@internal_dirs) {
+ 		return 0 if ($filename =~ /^\Q$dir\/\E/);
+ 	}
+ 	return 1;
+ }

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** lcov	20 Aug 2010 14:58:48 -0000	1.76
--- lcov	23 Aug 2010 14:47:40 -0000	1.77
***************
*** 187,190 ****
--- 187,192 ----
  our $opt_list_width = 80;
  our $opt_list_truncate_max = 20;
+ our $opt_external;
+ our $opt_no_external;
  our $ln_overall_found;
  our $ln_overall_hit;
***************
*** 270,273 ****
--- 272,277 ----
  		"list-full-path" => \$opt_list_full_path,
  		"no-list-full-path" => \$opt_no_list_full_path,
+ 		"external" => \$opt_external,
+ 		"no-external" => \$opt_no_external,
  		))
  {
***************
*** 295,298 ****
--- 299,307 ----
  		$opt_no_list_full_path = undef;
  	}
+ 
+ 	if (defined($opt_no_external)) {
+ 		$opt_external = 0;
+ 		$opt_no_external = undef;
+ 	}
  }
  
***************
*** 494,497 ****
--- 503,507 ----
        --derive-func-data          Generate function data from line data
        --list-full-path            Print full path during a list operation
+       --(no-)external             Include (ignore) data for external files
  
  For more information see: $lcov_url
***************
*** 821,824 ****
--- 831,842 ----
  		@param = (@param, "--debug");
  	}
+ 	if (defined($opt_external) && $opt_external)
+ 	{
+ 		@param = (@param, "--external");
+ 	}
+ 	if (defined($opt_external) && !$opt_external)
+ 	{
+ 		@param = (@param, "--no-external");
+ 	}
  	system(@param) and exit($? >> 8);
  }

[Ltp-cvs] utils/analysis/lcov/man geninfo.1, 1.17, 1.18 lcov.1, 1.22, 1.23 lcovrc.5, 1.16, 1.17

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

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

Modified Files:
	geninfo.1 lcov.1 lcovrc.5 
Log Message:
lcov: add option to exclude external files

Implement an option for users to specify that external source files should
be excluded when capturing coverage data. External source files are files
which are not located in the directories specified by the --directory and
--base-directory options of lcov/geninfo.


Index: geninfo.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/geninfo.1,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** geninfo.1	6 Aug 2010 11:14:38 -0000	1.17
--- geninfo.1	23 Aug 2010 14:47:43 -0000	1.18
***************
*** 33,36 ****
--- 33,38 ----
  .RB [ \-\-no\-recursion ]
  .I directory
+ .RB [ \-\-external ]
+ .RB [ \-\-no\-external ]
  .RE
  .SH DESCRIPTION
***************
*** 160,163 ****
--- 162,182 ----
  .RE
  
+ .B \-\-external
+ .br
+ .B \-\-no\-external
+ .br
+ .RS
+ Specify whether to capture coverage data for external source files.
+ 
+ External source files are files which are not located in one of the directories
+ specified by \-\-directory or \-\-base\-directory. Use \-\-external to include
+ external source files while capturing coverage data or \-\-no\-external to
+ ignore this data.
+ 
+ Data for external source files is
+ .B included
+ by default.
+ .RE
+ 
  .B \-f
  .br

Index: lcov.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcov.1,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** lcov.1	6 Aug 2010 11:14:38 -0000	1.22
--- lcov.1	23 Aug 2010 14:47:43 -0000	1.23
***************
*** 40,43 ****
--- 40,45 ----
  .br
  .RB [ \-\-no\-markers ]
+ .RB [ \-\-external ]
+ .RB [ \-\-no\-external ]
  .br
  .RE
***************
*** 346,349 ****
--- 348,368 ----
  .RE
  
+ .B \-\-external
+ .br
+ .B \-\-no\-external
+ .br
+ .RS
+ Specify whether to capture coverage data for external source files.
+ 
+ External source files are files which are not located in one of the directories
+ specified by \-\-directory or \-\-base\-directory. Use \-\-external to include
+ external source files while capturing coverage data or \-\-no\-external to
+ ignore this data.
+ 
+ Data for external source files is
+ .B included
+ by default.
+ .RE
+ 
  .B \-e
  .I tracefile

Index: lcovrc.5
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcovrc.5,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** lcovrc.5	20 Aug 2010 14:27:19 -0000	1.16
--- lcovrc.5	23 Aug 2010 14:47:43 -0000	1.17
***************
*** 198,203 ****
  # This value is ignored when lcov_list_full_path is non\-zero.
  .br
- 
  lcov_list_truncate_max = 20
  .PP
  
--- 198,209 ----
  # This value is ignored when lcov_list_full_path is non\-zero.
  .br
  lcov_list_truncate_max = 20
+ 
+ # Specify whether to capture coverage data for external source
+ .br
+ # files
+ .br
+ geninfo_external = 1
+ .br
  .PP
  
***************
*** 554,557 ****
--- 560,576 ----
  .PP
  
+ .BR geninfo_external " ="
+ .IR 0 | 1
+ .IP
+ If non\-zero, capture coverage data for external source files.
+ 
+ External source files are files which are not located in one of the directories
+ specified by the \-\-directory or \-\-base\-directory options of
+ .BR lcov / geninfo .
+ 
+ Default is 1.
+ .PP
+ 
+ 
  .BR lcov_gcov_dir " ="
  .I path_to_kernel_coverage_data

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.75,1.76

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

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

Modified Files:
	lcov 
Log Message:
lcov: pass --no-recursion to geninfo

When specifying --no-recursion, make sure that the option is also passed
to the helper tool geninfo. 


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** lcov	20 Aug 2010 13:14:50 -0000	1.75
--- lcov	20 Aug 2010 14:58:48 -0000	1.76
***************
*** 802,805 ****
--- 802,808 ----
  		@param = (@param, "--ignore-errors", $_);
  	}
+ 	if ($no_recursion) {
+ 		@param = (@param, "--no-recursion");
+ 	}
  	if ($initial)
  	{

[Ltp-cvs] utils/analysis/lcov/bin genhtml,1.54,1.55

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

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

Modified Files:
	genhtml 
Log Message:
genhtml: fix HTML page title for directory pages


Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** genhtml	20 Aug 2010 14:27:19 -0000	1.54
--- genhtml	20 Aug 2010 14:31:59 -0000	1.55
***************
*** 872,875 ****
--- 872,876 ----
  		$trunc_dir = "";
  	}
+ 	$title .= " - " if ($trunc_dir ne "");
  	write_html_prolog(*HTML_HANDLE, $base_dir, "LCOV - $title$trunc_dir");
  	write_header(*HTML_HANDLE, $view_type, $trunc_dir, $rel_dir,

[Ltp-cvs] utils/analysis/lcov/bin genhtml,1.53,1.54

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

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

Modified Files:
	genhtml 
Log Message:
genhtml: make HTML charset specification customizable

Provide a configuration file setting to adjust the charset specification
used by all generated HTML pages. Also change the default charset to UTF-8.


Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** genhtml	20 Aug 2010 13:08:24 -0000	1.53
--- genhtml	20 Aug 2010 14:27:19 -0000	1.54
***************
*** 289,292 ****
--- 289,293 ----
  our @opt_ignore_errors;	# Ignore certain error classes during processing
  our @ignore;
+ our $charset = "UTF-8";	# Default charset for HTML pages
  our @fileview_sortlist;
  our @fileview_sortname = ("", "-sort-l", "-sort-f", "-sort-b");
***************
*** 355,358 ****
--- 356,360 ----
  		"genhtml_branch_field_width"	=> \$br_field_width,
  		"genhtml_sort"			=> \$sort,
+ 		"genhtml_charset"		=> \$charset,
  		});
  }
***************
*** 4025,4029 ****
  
  	<head>
! 	  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
  	  <title>$_[3]</title>
  	  <link rel="stylesheet" type="text/css" href="$_[1]gcov.css">
--- 4027,4031 ----
  
  	<head>
! 	  <meta http-equiv="Content-Type" content="text/html; charset=$charset">
  	  <title>$_[3]</title>
  	  <link rel="stylesheet" type="text/css" href="$_[1]gcov.css">
***************
*** 4088,4092 ****
  	<head>
  	  <title>$_[3]</title>
! 	  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
  	  <link rel="stylesheet" type="text/css" href="$_[1]gcov.css">
  	</head>
--- 4090,4094 ----
  	<head>
  	  <title>$_[3]</title>
! 	  <meta http-equiv="Content-Type" content="text/html; charset=$charset">
  	  <link rel="stylesheet" type="text/css" href="$_[1]gcov.css">
  	</head>
***************
*** 5620,5624 ****
  
  <head>
!   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
    <title>\@pagetitle\@</title>
    <link rel="stylesheet" type="text/css" href="\@basedir\@gcov.css">
--- 5622,5626 ----
  
  <head>
!   <meta http-equiv="Content-Type" content="text/html; charset=$charset">
    <title>\@pagetitle\@</title>
    <link rel="stylesheet" type="text/css" href="\@basedir\@gcov.css">

[Ltp-cvs] utils/analysis/lcov lcovrc,1.13,1.14

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

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

Modified Files:
	lcovrc 
Log Message:
genhtml: make HTML charset specification customizable

Provide a configuration file setting to adjust the charset specification
used by all generated HTML pages. Also change the default charset to UTF-8.


Index: lcovrc
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/lcovrc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** lcovrc	5 Aug 2010 15:11:56 -0000	1.13
--- lcovrc	20 Aug 2010 14:27:19 -0000	1.14
***************
*** 88,91 ****
--- 88,94 ----
  genhtml_branch_coverage = 1
  
+ # Specify the character set of all generated HTML pages
+ genhtml_charset=UTF-8
+ 
  # Location of the gcov tool (same as --gcov-info option of geninfo)
  #geninfo_gcov_tool = gcov

[Ltp-cvs] utils/analysis/lcov/man lcovrc.5,1.15,1.16

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

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

Modified Files:
	lcovrc.5 
Log Message:
genhtml: make HTML charset specification customizable

Provide a configuration file setting to adjust the charset specification
used by all generated HTML pages. Also change the default charset to UTF-8.


Index: lcovrc.5
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcovrc.5,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** lcovrc.5	6 Aug 2010 11:14:38 -0000	1.15
--- lcovrc.5	20 Aug 2010 14:27:19 -0000	1.16
***************
*** 145,148 ****
--- 145,153 ----
  .br
  
+ # Specify the character set of all generated HTML pages
+ .br
+ genhtml_charset=UTF\-8
+ .br
+ 
  # Location of the gcov tool
  .br
***************
*** 481,484 ****
--- 486,503 ----
  .PP
  
+ .BR genhtml_charset " ="
+ .I charset
+ .IP
+ Specify the character set of all generated HTML pages.
+ .br
+ 
+ Use this option if the source code contains characters which are not
+ part of the default character set. Note that this option is ignored
+ when a custom HTML prolog is specified (see also
+ .BR genhtml_html_prolog ).
+ .br
+ 
+ Default is UTF-8.
+ .PP
  .BR geninfo_gcov_tool " ="
  .I path_to_gcov

[Ltp-cvs] utils/analysis/lcov/man genhtml.1, 1.20, 1.21 genpng.1, 1.6, 1.7

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

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

Modified Files:
	genhtml.1 genpng.1 
Log Message:
lcov: follow Perl naming guidelines


Index: genpng.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/genpng.1,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** genpng.1	6 Aug 2010 11:14:38 -0000	1.6
--- genpng.1	20 Aug 2010 13:14:50 -0000	1.7
***************
*** 24,28 ****
  Note that the
  .I GD.pm
! PERL module has to be installed for this script to work
  (it may be obtained from
  .IR http://www.cpan.org ).
--- 24,28 ----
  Note that the
  .I GD.pm
! Perl module has to be installed for this script to work
  (it may be obtained from
  .IR http://www.cpan.org ).

Index: genhtml.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/genhtml.1,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** genhtml.1	20 Aug 2010 13:08:25 -0000	1.20
--- genhtml.1	20 Aug 2010 13:14:50 -0000	1.21
***************
*** 121,125 ****
  an overview of the source code as a "clickable" image. Note that this
  option will slow down output creation noticeably because each source
! code character has to be inspected once. Note also that the GD.pm PERL
  module has to be installed for this option to work (it may be obtained
  from http://www.cpan.org).
--- 121,125 ----
  an overview of the source code as a "clickable" image. Note that this
  option will slow down output creation noticeably because each source
! code character has to be inspected once. Note also that the GD.pm Perl
  module has to be installed for this option to work (it may be obtained
  from http://www.cpan.org).

[Ltp-cvs] utils/analysis/lcov/bin genpng,1.15,1.16 lcov,1.74,1.75

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

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

Modified Files:
	genpng lcov 
Log Message:
lcov: follow Perl naming guidelines


Index: genpng
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genpng,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** genpng	6 Aug 2010 11:25:12 -0000	1.15
--- genpng	20 Aug 2010 13:14:50 -0000	1.16
***************
*** 23,27 ****
  #   representing each source code character by a single pixel.
  #
! #   Note that the PERL module GD.pm is required for this script to work.
  #   It may be obtained from http://www.cpan.org
  #
--- 23,27 ----
  #   representing each source code character by a single pixel.
  #
! #   Note that the Perl module GD.pm is required for this script to work.
  #   It may be obtained from http://www.cpan.org
  #

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** lcov	20 Aug 2010 13:08:24 -0000	1.74
--- lcov	20 Aug 2010 13:14:50 -0000	1.75
***************
*** 2589,2593 ****
  # transform_pattern(pattern)
  #
! # Transform shell wildcard expression to equivalent PERL regular expression.
  # Return transformed pattern.
  #
--- 2589,2593 ----
  # transform_pattern(pattern)
  #
! # Transform shell wildcard expression to equivalent Perl regular expression.
  # Return transformed pattern.
  #

[Ltp-cvs] utils/analysis/lcov README,1.11,1.12

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

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

Modified Files:
	README 
Log Message:
lcov: follow Perl naming guidelines


Index: README
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/README,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** README	6 Aug 2010 11:14:37 -0000	1.11
--- README	20 Aug 2010 13:14:50 -0000	1.12
***************
*** 8,12 ****
    LCOV is an extension of GCOV, a GNU tool which provides information about
    what parts of a program are actually executed (i.e. "covered") while running
!   a particular test case. The extension consists of a set of PERL scripts
    which build on the textual GCOV output to implement the following enhanced
    functionality:
--- 8,12 ----
    LCOV is an extension of GCOV, a GNU tool which provides information about
    what parts of a program are actually executed (i.e. "covered") while running
!   a particular test case. The extension consists of a set of Perl scripts
    which build on the textual GCOV output to implement the following enhanced
    functionality:
***************
*** 81,85 ****
  
  Copy the resulting gcov kernel module file to either the system wide modules
! directory or the same directory as the PERL scripts. As root, do the following:
  
    a) Resetting counters
--- 81,85 ----
  
  Copy the resulting gcov kernel module file to either the system wide modules
! directory or the same directory as the Perl scripts. As root, do the following:
  
    a) Resetting counters

[Ltp-cvs] utils/analysis/lcov/man genhtml.1,1.19,1.20

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

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

Modified Files:
	genhtml.1 
Log Message:
genhtml: add --ignore-errors option

Provide a means for users to specify that genhtml should not abort if
it cannot read a source code file. Also make handling of --ignore-errors
parameter consistent accross lcov, geninfo and genhtml.


Index: genhtml.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/genhtml.1,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** genhtml.1	6 Aug 2010 11:14:38 -0000	1.19
--- genhtml.1	20 Aug 2010 13:08:25 -0000	1.20
***************
*** 57,60 ****
--- 57,62 ----
  .br
  .RB [ \-\-demangle\-cpp ]
+ .RB [ \-\-ignore\-errors
+ .IR errors  ]
  .br
  .IR tracefile(s)
***************
*** 480,483 ****
--- 482,502 ----
  .BR c++filt (1)).
  
+ .RE
+ .B \-\-ignore\-errors
+ .I errors
+ .br
+ .RS
+ Specify a list of errors after which to continue processing.
+ 
+ Use this option to specify a list of one or more classes of errors after which
+ geninfo should continue processing instead of aborting.
+ 
+ .I errors
+ can be a comma\-separated list of the following keywords:
+ 
+ .B source:
+ the source code file for a data set could not be found.
+ .RE
+ 
  .SH FILES
  

[Ltp-cvs] utils/analysis/lcov/bin genhtml, 1.52, 1.53 geninfo, 1.82, 1.83 lcov, 1.73, 1.74

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

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

Modified Files:
	genhtml geninfo lcov 
Log Message:
genhtml: add --ignore-errors option

Provide a means for users to specify that genhtml should not abort if
it cannot read a source code file. Also make handling of --ignore-errors
parameter consistent accross lcov, geninfo and genhtml.


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** geninfo	6 Aug 2010 11:25:12 -0000	1.82
--- geninfo	20 Aug 2010 13:08:24 -0000	1.83
***************
*** 73,79 ****
--- 73,85 ----
  our $COMPAT_HAMMER	= "hammer";
  
+ # Error classes which users may specify to ignore during processing
  our $ERROR_GCOV		= 0;
  our $ERROR_SOURCE	= 1;
  our $ERROR_GRAPH	= 2;
+ our %ERROR_ID = (
+ 	"gcov" => $ERROR_GCOV,
+ 	"source" => $ERROR_SOURCE,
+ 	"graph" => $ERROR_GRAPH,
+ );
  
  our $EXCL_START = "LCOV_EXCL_START";
***************
*** 143,146 ****
--- 149,153 ----
  sub debug($);
  sub int_handler();
+ sub parse_ignore_errors(@);
  
  
***************
*** 279,282 ****
--- 286,292 ----
  }
  
+ # Determine which errors the user wants us to ignore
+ parse_ignore_errors(@ignore_errors);
+ 
  # Make sure test names only contain valid characters
  if ($test_name =~ s/\W/_/g)
***************
*** 359,388 ****
  }
  
- if (@ignore_errors)
- {
- 	my @expanded;
- 	my $error;
- 
- 	# Expand comma-separated entries
- 	foreach (@ignore_errors) {
- 		if (/,/)
- 		{
- 			push(@expanded, split(",", $_));
- 		}
- 		else
- 		{
- 			push(@expanded, $_);
- 		}
- 	}
- 
- 	foreach (@expanded)
- 	{
- 		/^gcov$/ && do { $ignore[$ERROR_GCOV] = 1; next; } ;
- 		/^source$/ && do { $ignore[$ERROR_SOURCE] = 1; next; };
- 		/^graph$/ && do { $ignore[$ERROR_GRAPH] = 1; next; };
- 		die("ERROR: unknown argument for --ignore-errors: $_\n");
- 	}
- }
- 
  if (system_no_output(3, $gcov_tool, "--help") == -1)
  {
--- 369,372 ----
***************
*** 3067,3068 ****
--- 3051,3087 ----
  	return \%capabilities;
  }
+ 
+ #
+ # parse_ignore_errors(@ignore_errors)
+ #
+ # Parse user input about which errors to ignore.
+ #
+ 
+ sub parse_ignore_errors(@)
+ {
+ 	my (@ignore_errors) = @_;
+ 	my @items;
+ 	my $item;
+ 
+ 	return if (!@ignore_errors);
+ 
+ 	foreach $item (@ignore_errors) {
+ 		$item =~ s/\s//g;
+ 		if ($item =~ /,/) {
+ 			# Split and add comma-separated parameters
+ 			push(@items, split(/,/, $item));
+ 		} else {
+ 			# Add single parameter
+ 			push(@items, $item);
+ 		}
+ 	}
+ 	foreach $item (@items) {
+ 		my $item_id = $ERROR_ID{lc($item)};
+ 
+ 		if (!defined($item_id)) {
+ 			die("ERROR: unknown argument for --ignore-errors: ".
+ 			    "$item\n");
+ 		}
+ 		$ignore[$item_id] = 1;
+ 	}
+ }

Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** genhtml	6 Aug 2010 11:25:12 -0000	1.52
--- genhtml	20 Aug 2010 13:08:24 -0000	1.53
***************
*** 156,159 ****
--- 156,165 ----
  our $BR_ADD = 1;
  
+ # Error classes which users may specify to ignore during processing
+ our $ERROR_SOURCE	= 0;
+ our %ERROR_ID = (
+ 	"source" => $ERROR_SOURCE,
+ );
+ 
  # Data related prototypes
  sub print_usage(*);
***************
*** 199,202 ****
--- 205,209 ----
  sub warn_handler($);
  sub die_handler($);
+ sub parse_ignore_errors(@);
  
  
***************
*** 280,283 ****
--- 287,292 ----
  our $html_gzip = 0;	# Compress with gzip
  our $demangle_cpp = 0;	# Demangle C++ function names
+ our @opt_ignore_errors;	# Ignore certain error classes during processing
+ our @ignore;
  our @fileview_sortlist;
  our @fileview_sortname = ("", "-sort-l", "-sort-f", "-sort-b");
***************
*** 384,387 ****
--- 393,397 ----
  		"no-sort"		=> \$no_sort,
  		"demangle-cpp"		=> \$demangle_cpp,
+ 		"ignore-errors=s"	=> \@opt_ignore_errors,
  		))
  {
***************
*** 419,422 ****
--- 429,435 ----
  }
  
+ # Determine which errors the user wants us to ignore
+ parse_ignore_errors(@opt_ignore_errors);
+ 
  # Check for info filename
  if (!@info_filenames)
***************
*** 568,571 ****
--- 581,585 ----
        --(no-)sort                   Enable (disable) sorted coverage views
        --demangle-cpp                Demangle C++ function names
+       --ignore-errors ERRORS        Continue after ERRORS (source)
  
  For more information see: $lcov_url
***************
*** 4959,4962 ****
--- 4973,4977 ----
  	my $datafunc = get_hash_reverse($funcdata);
  	my $add_anchor;
+ 	my @file;
  
  	if ($_[2])
***************
*** 4965,4975 ****
  	}
  
! 	open(SOURCE_HANDLE, "<".$source_filename)
! 		or die("ERROR: cannot open $source_filename for reading!\n");
  	
  	write_source_prolog(*HTML_HANDLE);
! 
! 	for ($line_number = 1; <SOURCE_HANDLE> ; $line_number++)
! 	{
  		chomp($_);
  
--- 4980,5013 ----
  	}
  
! 	if (!open(SOURCE_HANDLE, "<".$source_filename)) {
! 		my @lines;
! 		my $last_line = 0;
! 
! 		if (!$ignore[$ERROR_SOURCE]) {
! 			die("ERROR: cannot read $source_filename\n");
! 		}
! 
! 		# Continue without source file
! 		warn("WARNING: cannot read $source_filename!\n");
! 
! 		@lines = sort( { $a <=> $b }  keys(%count_data));
! 		if (@lines) {
! 			$last_line = $lines[scalar(@lines) - 1];
! 		}
! 		return ( ":" ) if ($last_line < 1);
! 
! 		# Simulate gcov behavior
! 		for ($line_number = 1; $line_number <= $last_line;
! 		     $line_number++) {
! 			push(@file, "/* EOF */");
! 		}
! 	} else {
! 		@file = <SOURCE_HANDLE>;
! 	}
  	
  	write_source_prolog(*HTML_HANDLE);
! 	$line_number = 0;
! 	foreach (@file) {
! 		$line_number++;
  		chomp($_);
  
***************
*** 5647,5648 ****
--- 5685,5721 ----
  	die("$tool_name: $msg");
  }
+ 
+ #
+ # parse_ignore_errors(@ignore_errors)
+ #
+ # Parse user input about which errors to ignore.
+ #
+ 
+ sub parse_ignore_errors(@)
+ {
+ 	my (@ignore_errors) = @_;
+ 	my @items;
+ 	my $item;
+ 
+ 	return if (!@ignore_errors);
+ 
+ 	foreach $item (@ignore_errors) {
+ 		$item =~ s/\s//g;
+ 		if ($item =~ /,/) {
+ 			# Split and add comma-separated parameters
+ 			push(@items, split(/,/, $item));
+ 		} else {
+ 			# Add single parameter
+ 			push(@items, $item);
+ 		}
+ 	}
+ 	foreach $item (@items) {
+ 		my $item_id = $ERROR_ID{lc($item)};
+ 
+ 		if (!defined($item_id)) {
+ 			die("ERROR: unknown argument for --ignore-errors: ".
+ 			    "$item\n");
+ 		}
+ 		$ignore[$item_id] = 1;
+ 	}
+ }

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** lcov	6 Aug 2010 11:25:12 -0000	1.73
--- lcov	20 Aug 2010 13:08:24 -0000	1.74
***************
*** 169,173 ****
  our $no_compat_libtool;	# If set, indicates that libtool mode is to be disabled
  our $gcov_tool;
! our $ignore_errors;
  our $initial;
  our $no_recursion = 0;
--- 169,173 ----
  our $no_compat_libtool;	# If set, indicates that libtool mode is to be disabled
  our $gcov_tool;
! our @opt_ignore_errors;
  our $initial;
  our $no_recursion = 0;
***************
*** 260,264 ****
  		"no-compat-libtool" => \$no_compat_libtool,
  		"gcov-tool=s" => \$gcov_tool,
! 		"ignore-errors=s" => \$ignore_errors,
  		"initial|i" => \$initial,
  		"no-recursion" => \$no_recursion,
--- 260,264 ----
  		"no-compat-libtool" => \$no_compat_libtool,
  		"gcov-tool=s" => \$gcov_tool,
! 		"ignore-errors=s" => \@opt_ignore_errors,
  		"initial|i" => \$initial,
  		"no-recursion" => \$no_recursion,
***************
*** 799,805 ****
  		@param = (@param, "--gcov-tool", $gcov_tool);
  	}
! 	if ($ignore_errors)
! 	{
! 		@param = (@param, "--ignore-errors", $ignore_errors);
  	}
  	if ($initial)
--- 799,804 ----
  		@param = (@param, "--gcov-tool", $gcov_tool);
  	}
! 	foreach (@opt_ignore_errors) {
! 		@param = (@param, "--ignore-errors", $_);
  	}
  	if ($initial)

[Ltp-cvs] utils/analysis/lcov Makefile,1.18,1.19

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

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

Modified Files:
	Makefile 
Log Message:
lcov: update CVS version to 1.10


Index: Makefile
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile	6 Aug 2010 11:14:37 -0000	1.18
--- Makefile	6 Aug 2010 11:25:12 -0000	1.19
***************
*** 12,17 ****
  #
  
! VERSION := 1.9
! RELEASE := 1
  
  CFG_DIR := $(PREFIX)/etc
--- 12,17 ----
  #
  
! VERSION := 1.10
! RELEASE := pre1
  
  CFG_DIR := $(PREFIX)/etc