ltp-cvs — LTP CVS Commits

[Ltp-cvs] utils/analysis/lcov/bin gendesc, 1.13, 1.14 genhtml, 1.51, 1.52 geninfo, 1.81, 1.82 genpng, 1.14, 1.15 lcov, 1.72, 1.73

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

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

Modified Files:
	gendesc genhtml geninfo genpng lcov 
Log Message:
lcov: update CVS version to 1.10


Index: genpng
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genpng,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** genpng	6 Aug 2010 11:14:38 -0000	1.14
--- genpng	6 Aug 2010 11:25:12 -0000	1.15
***************
*** 36,40 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 36,40 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.10 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** genhtml	6 Aug 2010 11:14:38 -0000	1.51
--- genhtml	6 Aug 2010 11:25:12 -0000	1.52
***************
*** 73,77 ****
  # Global constants
  our $title		= "LCOV - code coverage report";
! our $lcov_version	= 'LCOV version 1.9';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 73,77 ----
  # Global constants
  our $title		= "LCOV - code coverage report";
! our $lcov_version	= 'LCOV version 1.10 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** lcov	6 Aug 2010 11:14:38 -0000	1.72
--- lcov	6 Aug 2010 11:25:12 -0000	1.73
***************
*** 72,76 ****
  
  # Global constants
! our $lcov_version	= 'LCOV version 1.9';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 72,76 ----
  
  # Global constants
! our $lcov_version	= 'LCOV version 1.10 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: gendesc
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/gendesc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** gendesc	6 Aug 2010 11:14:38 -0000	1.13
--- gendesc	6 Aug 2010 11:25:12 -0000	1.14
***************
*** 42,46 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 42,46 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.10 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** geninfo	6 Aug 2010 11:14:38 -0000	1.81
--- geninfo	6 Aug 2010 11:25:12 -0000	1.82
***************
*** 59,63 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $gcov_tool		= "gcov";
--- 59,63 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.10 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $gcov_tool		= "gcov";

[Ltp-cvs] utils/analysis/lcov/rpm lcov.spec,1.14,1.15

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

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

Modified Files:
	lcov.spec 
Log Message:
lcov: update CVS version to 1.10


Index: lcov.spec
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/rpm/lcov.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** lcov.spec	6 Aug 2010 11:14:38 -0000	1.14
--- lcov.spec	6 Aug 2010 11:25:12 -0000	1.15
***************
*** 1,6 ****
  Summary: A graphical GCOV front-end
  Name: lcov
! Version: 1.9
! Release: 1
  License: GPL
  Group: Development/Tools
--- 1,6 ----
  Summary: A graphical GCOV front-end
  Name: lcov
! Version: 1.10
! Release: pre1
  License: GPL
  Group: Development/Tools

[Ltp-cvs] utils/analysis/lcov/bin gendesc, 1.12, 1.13 genhtml, 1.50, 1.51 geninfo, 1.80, 1.81 genpng, 1.13, 1.14 lcov, 1.71, 1.72

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

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

Modified Files:
	gendesc genhtml geninfo genpng lcov 
Log Message:
lcov: finalizing release 1.9


Index: genpng
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genpng,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** genpng	29 Jan 2010 11:07:25 -0000	1.13
--- genpng	6 Aug 2010 11:14:38 -0000	1.14
***************
*** 36,40 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 36,40 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** genhtml	19 Jul 2010 16:06:15 -0000	1.50
--- genhtml	6 Aug 2010 11:14:38 -0000	1.51
***************
*** 73,77 ****
  # Global constants
  our $title		= "LCOV - code coverage report";
! our $lcov_version	= 'LCOV version 1.9 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 73,77 ----
  # Global constants
  our $title		= "LCOV - code coverage report";
! our $lcov_version	= 'LCOV version 1.9';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** lcov	5 Aug 2010 15:11:56 -0000	1.71
--- lcov	6 Aug 2010 11:14:38 -0000	1.72
***************
*** 72,76 ****
  
  # Global constants
! our $lcov_version	= 'LCOV version 1.9 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 72,76 ----
  
  # Global constants
! our $lcov_version	= 'LCOV version 1.9';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: gendesc
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/gendesc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gendesc	29 Jan 2010 11:07:25 -0000	1.12
--- gendesc	6 Aug 2010 11:14:38 -0000	1.13
***************
*** 42,46 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 42,46 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** geninfo	28 Jul 2010 14:48:25 -0000	1.80
--- geninfo	6 Aug 2010 11:14:38 -0000	1.81
***************
*** 59,63 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $gcov_tool		= "gcov";
--- 59,63 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $gcov_tool		= "gcov";

[Ltp-cvs] utils/analysis/lcov/man gendesc.1, 1.6, 1.7 genhtml.1, 1.18, 1.19 geninfo.1, 1.16, 1.17 genpng.1, 1.5, 1.6 lcov.1, 1.21, 1.22 lcovrc.5, 1.14, 1.15

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

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

Modified Files:
	gendesc.1 genhtml.1 geninfo.1 genpng.1 lcov.1 lcovrc.5 
Log Message:
lcov: finalizing release 1.9


Index: genhtml.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/genhtml.1,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** genhtml.1	29 Jan 2010 10:09:53 -0000	1.18
--- genhtml.1	6 Aug 2010 11:14:38 -0000	1.19
***************
*** 1,3 ****
! .TH genhtml 1 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  .SH NAME
  genhtml \- Generate HTML view from LCOV coverage data files
--- 1,3 ----
! .TH genhtml 1 "LCOV 1.9" 2010\-08\-06 "User Manuals"
  .SH NAME
  genhtml \- Generate HTML view from LCOV coverage data files

Index: lcov.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcov.1,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** lcov.1	19 Jul 2010 14:27:08 -0000	1.21
--- lcov.1	6 Aug 2010 11:14:38 -0000	1.22
***************
*** 1,3 ****
! .TH lcov 1 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  .SH NAME
  lcov \- a graphical GCOV front\-end
--- 1,3 ----
! .TH lcov 1 "LCOV 1.9" 2010\-08\-06 "User Manuals"
  .SH NAME
  lcov \- a graphical GCOV front\-end

Index: lcovrc.5
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcovrc.5,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** lcovrc.5	5 Aug 2010 15:11:56 -0000	1.14
--- lcovrc.5	6 Aug 2010 11:14:38 -0000	1.15
***************
*** 1,3 ****
! .TH lcovrc 5 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  
  .SH NAME
--- 1,3 ----
! .TH lcovrc 5 "LCOV 1.9" 2010\-08\-06 "User Manuals"
  
  .SH NAME

Index: gendesc.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/gendesc.1,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gendesc.1	29 Jan 2010 10:09:53 -0000	1.6
--- gendesc.1	6 Aug 2010 11:14:38 -0000	1.7
***************
*** 1,3 ****
! .TH gendesc 1 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  .SH NAME
  gendesc \- Generate a test case description file
--- 1,3 ----
! .TH gendesc 1 "LCOV 1.9" 2010\-08\-06 "User Manuals"
  .SH NAME
  gendesc \- Generate a test case description file

Index: geninfo.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/geninfo.1,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** geninfo.1	29 Jan 2010 10:09:53 -0000	1.16
--- geninfo.1	6 Aug 2010 11:14:38 -0000	1.17
***************
*** 1,3 ****
! .TH geninfo 1 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  .SH NAME
  geninfo \- Generate tracefiles from .da files
--- 1,3 ----
! .TH geninfo 1 "LCOV 1.9" 2010\-08\-06 "User Manuals"
  .SH NAME
  geninfo \- Generate tracefiles from .da files

Index: genpng.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/genpng.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** genpng.1	29 Jan 2010 10:09:53 -0000	1.5
--- genpng.1	6 Aug 2010 11:14:38 -0000	1.6
***************
*** 1,3 ****
! .TH genpng 1 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  .SH NAME
  genpng \- Generate an overview image from a source file
--- 1,3 ----
! .TH genpng 1 "LCOV 1.9" 2010\-08\-06 "User Manuals"
  .SH NAME
  genpng \- Generate an overview image from a source file

[Ltp-cvs] utils/analysis/lcov Makefile,1.17,1.18 README,1.10,1.11

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

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

Modified Files:
	Makefile README 
Log Message:
lcov: finalizing release 1.9


Index: README
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/README,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** README	29 Jan 2010 10:09:53 -0000	1.10
--- README	6 Aug 2010 11:14:37 -0000	1.11
***************
*** 1,5 ****
  -------------------------------------------------
  - README file for the LTP GCOV extension (LCOV) -
! - Last changes: 2010-01-29                      -
  -------------------------------------------------
  
--- 1,5 ----
  -------------------------------------------------
  - README file for the LTP GCOV extension (LCOV) -
! - Last changes: 2010-08-06                      -
  -------------------------------------------------
  

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

[Ltp-cvs] utils/analysis/lcov/rpm lcov.spec,1.13,1.14

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

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

Modified Files:
	lcov.spec 
Log Message:
lcov: finalizing release 1.9


Index: lcov.spec
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/rpm/lcov.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** lcov.spec	29 Jan 2010 11:07:25 -0000	1.13
--- lcov.spec	6 Aug 2010 11:14:38 -0000	1.14
***************
*** 2,6 ****
  Name: lcov
  Version: 1.9
! Release: pre1
  License: GPL
  Group: Development/Tools
--- 2,6 ----
  Name: lcov
  Version: 1.9
! Release: 1
  License: GPL
  Group: Development/Tools

[Ltp-cvs] utils/analysis/lcov CHANGES,1.23,1.24

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

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

Modified Files:
	CHANGES 
Log Message:
lcov: update CHANGES file in preparation of new release


Index: CHANGES
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/CHANGES,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** CHANGES	29 Jan 2010 10:01:35 -0000	1.23
--- CHANGES	5 Aug 2010 16:17:44 -0000	1.24
***************
*** 1,2 ****
--- 1,38 ----
+ Version 1.9
+ ===========
+ 
+ genhtml:
+ - Improved wording for branch representation tooltip text
+ - Fixed vertical alignment of HTML branch representation
+ 
+ geninfo:
+ - Improved warning message about --initial not generating branch coverage data
+ - Debugging messages are now printed to STDERR instead of STDOUT
+ - Fixed problem with some .gcno files. Reported by gu...@fu....
+   (file.gcno: reached unexpected end of file)
+ - Fixed problem with relative build paths. Reported by zha...@gm....
+   (cannot find an entry for ^#src#test.c.gcov in .gcno file, skipping file!)
+ - Fixed problem where coverage data is missing for some files. Reported by
+   wes...@op...
+ - Fixed problem where exclusion markers are ignored when gathering
+   initial coverage data. Reported by ahm...@me....
+ - Fixed large execution counts showing as negative numbers in HTML output.
+   Reported by kky...@ya....
+ - Fixed problem that incorrectly associated branches outside of a block with
+   branches inside the first block
+ 
+ lcov:
+ - Fixed problem that made lcov ignore --kernel-directory parameters when
+   specifying --initial. Reported by hj...@re....
+ - Added --list-full-path option to prevent lcov from truncating paths in list
+   output
+ - Added lcov_list_width and lcov_list_truncate_max directives to the
+   lcov configuration file to allow for list output customization
+ - Improved list output
+ 
+ COPYING:
+ - Added license text to better comply with GPL recommendations
+ 
+ 
  Version 1.8
  ===========

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

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

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

Modified Files:
	lcovrc.5 
Log Message:
lcov: introduce configuration file parameters for list output

Make some aspects of list output customizable via configuration
file parameters. Also introduce special handling, if the root
directory is chosen as prefix.


Index: lcovrc.5
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcovrc.5,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** lcovrc.5	19 Jul 2010 14:27:08 -0000	1.13
--- lcovrc.5	5 Aug 2010 15:11:56 -0000	1.14
***************
*** 179,182 ****
--- 179,198 ----
  lcov_list_full_path = 0
  .br
+ 
+ # Specify the maximum width for list output. This value is
+ .br
+ # ignored when lcov_list_full_path is non\-zero.
+ .br
+ lcov_list_width = 80
+ .br
+ 
+ # Specify the maximum percentage of file names which may be
+ .br
+ # truncated when choosing a directory prefix in list output.
+ .br
+ # This value is ignored when lcov_list_full_path is non\-zero.
+ .br
+ 
+ lcov_list_truncate_max = 20
  .PP
  
***************
*** 551,554 ****
--- 567,592 ----
  .PP
  
+ .BR lcov_list_max_width " ="
+ .IR width
+ .IP
+ Specify the maximum width for list output. This value is ignored when
+ lcov_list_full_path is non\-zero.
+ .br
+ 
+ Default is 80.
+ .PP
+ 
+ .BR lcov_list_truncate_max
+ .B " ="
+ .IR percentage
+ .IP
+ Specify the maximum percentage of file names which may be truncated when
+ choosing a directory prefix in list output. This value is ignored when
+ lcov_list_full_path is non\-zero.
+ .br
+ 
+ Default is 20.
+ .PP
+ 
  .SH FILES
  

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

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

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

Modified Files:
	lcovrc 
Log Message:
lcov: introduce configuration file parameters for list output

Make some aspects of list output customizable via configuration
file parameters. Also introduce special handling, if the root
directory is chosen as prefix.


Index: lcovrc
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/lcovrc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lcovrc	19 Jul 2010 14:27:08 -0000	1.12
--- lcovrc	5 Aug 2010 15:11:56 -0000	1.13
***************
*** 120,121 ****
--- 120,130 ----
  # option of lcov)
  lcov_list_full_path = 0
+ 
+ # Specify the maximum width for list output. This value is ignored when
+ # lcov_list_full_path is non-zero.
+ lcov_list_width = 80
+ 
+ # Specify the maximum percentage of file names which may be truncated when
+ # choosing a directory prefix in list output. This value is ignored when
+ # lcov_list_full_path is non-zero.
+ lcov_list_truncate_max = 20

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.70,1.71

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

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

Modified Files:
	lcov 
Log Message:
lcov: introduce configuration file parameters for list output

Make some aspects of list output customizable via configuration
file parameters. Also introduce special handling, if the root
directory is chosen as prefix.


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** lcov	5 Aug 2010 14:07:35 -0000	1.70
--- lcov	5 Aug 2010 15:11:56 -0000	1.71
***************
*** 185,188 ****
--- 185,190 ----
  our $opt_list_full_path;
  our $opt_no_list_full_path;
+ our $opt_list_width = 80;
+ our $opt_list_truncate_max = 20;
  our $ln_overall_found;
  our $ln_overall_hit;
***************
*** 228,231 ****
--- 230,235 ----
  		"lcov_tmp_dir"		=> \$tmp_dir,
  		"lcov_list_full_path"	=> \$opt_list_full_path,
+ 		"lcov_list_width"	=> \$opt_list_width,
+ 		"lcov_list_truncate_max"=> \$opt_list_truncate_max,
  	});
  }
***************
*** 307,310 ****
--- 311,320 ----
  }
  
+ # Check list width option
+ if ($opt_list_width <= 40) {
+ 	die("ERROR: lcov_list_width parameter out of range (needs to be ".
+ 	    "larger than 40)\n");
+ }
+ 
  # Normalize --path text
  $diff_path =~ s/\/$//;
***************
*** 2880,2887 ****
  	my @fwidth = @fwidth_wide;
  	my $w;
! 	my $max_width = 80;
! 	my $max_long = 20;
  	my $fwidth_narrow_length;
  	my $fwidth_wide_length;
  
  	# Calculate total width of narrow fields
--- 2890,2899 ----
  	my @fwidth = @fwidth_wide;
  	my $w;
! 	my $max_width = $opt_list_width;
! 	my $max_long = $opt_list_truncate_max;
  	my $fwidth_narrow_length;
  	my $fwidth_wide_length;
+ 	my $got_prefix = 0;
+ 	my $root_prefix = 0;
  
  	# Calculate total width of narrow fields
***************
*** 2898,2906 ****
  	$prefix = get_prefix($max_width - $fwidth_narrow_length, $max_long,
  			     keys(%{$data}));
  	$prefix =~ s/\/$//;
  	# Get longest filename length
  	foreach $filename (keys(%{$data})) {
  		if (!$opt_list_full_path) {
! 			if ((length($prefix) == 0) ||
  			    !($filename =~ s/^\Q$prefix\/\E//)) {
  				my ($v, $d, $f) = splitpath($filename);
--- 2910,2920 ----
  	$prefix = get_prefix($max_width - $fwidth_narrow_length, $max_long,
  			     keys(%{$data}));
+ 	$root_prefix = 1 if ($prefix eq rootdir());
+ 	$got_prefix = 1 if (length($prefix) > 0);
  	$prefix =~ s/\/$//;
  	# Get longest filename length
  	foreach $filename (keys(%{$data})) {
  		if (!$opt_list_full_path) {
! 			if (!$got_prefix || !$root_prefix &&
  			    !($filename =~ s/^\Q$prefix\/\E//)) {
  				my ($v, $d, $f) = splitpath($filename);
***************
*** 3001,3005 ****
  
  			$print_filename = $filename;
! 			if ((length($prefix) == 0) ||
  			    !($print_filename =~ s/^\Q$prefix\/\E//)) {
  				my ($v, $d, $f) = splitpath($filename);
--- 3015,3019 ----
  
  			$print_filename = $filename;
! 			if (!$got_prefix || !$root_prefix &&
  			    !($print_filename =~ s/^\Q$prefix\/\E//)) {
  				my ($v, $d, $f) = splitpath($filename);
***************
*** 3015,3019 ****
  				print("\n") if (defined($lastpath));
  				$lastpath = $p;
! 				print("[$lastpath/]\n");
  			}
  			$print_filename = shorten_filename($print_filename,
--- 3029,3033 ----
  				print("\n") if (defined($lastpath));
  				$lastpath = $p;
! 				print("[$lastpath/]\n") if (!$root_prefix);
  			}
  			$print_filename = shorten_filename($print_filename,

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.69,1.70

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

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

Modified Files:
	lcov 
Log Message:
lcov: switch coverage rate and number columns in list view

To be more consistent with the order of output in the "Overall
coverage rate" case, rates are now shown first in the list output.


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** lcov	5 Aug 2010 11:22:12 -0000	1.69
--- lcov	5 Aug 2010 14:07:35 -0000	1.70
***************
*** 2944,2982 ****
  	$heading2 	= sprintf("%-*s|", $w, "Filename");
  	$barlen		= $w + 1;
! 	# Number of lines
! 	$w = $fwidth[$F_LN_NUM];
  	$format		.= "%${w}s ";
! 	$heading1 	.= sprintf("%-*s |", $w + $fwidth[$F_LN_RATE],
  				   "Lines");
! 	$heading2 	.= sprintf("%-*s ", $w, "Num");
  	$barlen		+= $w + 1;
! 	# Line coverage rate
! 	$w = $fwidth[$F_LN_RATE];
  	$format		.= "%${w}s|";
! 	$heading2	.= sprintf("%*s|", $w, "Rate");
  	$barlen		+= $w + 1;
! 	# Number of functions
! 	$w = $fwidth[$F_FN_NUM];
  	$format		.= "%${w}s ";
! 	$heading1 	.= sprintf("%-*s|", $w + $fwidth[$F_FN_RATE] + 1,
  				   "Functions");
! 	$heading2 	.= sprintf("%-*s ", $w, "Num");
  	$barlen		+= $w + 1;
! 	# Function coverage rate
! 	$w = $fwidth[$F_FN_RATE];
  	$format		.= "%${w}s|";
! 	$heading2	.= sprintf("%*s|", $w, "Rate");
  	$barlen		+= $w + 1;
! 	# Number of branches
! 	$w = $fwidth[$F_BR_NUM];
  	$format		.= "%${w}s ";
! 	$heading1 	.= sprintf("%-*s", $w + $fwidth[$F_BR_RATE] + 1,
  				   "Branches");
! 	$heading2 	.= sprintf("%-*s ", $w, "Num");
  	$barlen		+= $w + 1;
! 	# Branch coverage rate
! 	$w = $fwidth[$F_BR_RATE];
  	$format		.= "%${w}s";
! 	$heading2	.= sprintf("%*s", $w, "Rate");
  	$barlen		+= $w;
  	# Line end
--- 2944,2982 ----
  	$heading2 	= sprintf("%-*s|", $w, "Filename");
  	$barlen		= $w + 1;
! 	# Line coverage rate
! 	$w = $fwidth[$F_LN_RATE];
  	$format		.= "%${w}s ";
! 	$heading1 	.= sprintf("%-*s |", $w + $fwidth[$F_LN_NUM],
  				   "Lines");
! 	$heading2 	.= sprintf("%-*s ", $w, "Rate");
  	$barlen		+= $w + 1;
! 	# Number of lines
! 	$w = $fwidth[$F_LN_NUM];
  	$format		.= "%${w}s|";
! 	$heading2	.= sprintf("%*s|", $w, "Num");
  	$barlen		+= $w + 1;
! 	# Function coverage rate
! 	$w = $fwidth[$F_FN_RATE];
  	$format		.= "%${w}s ";
! 	$heading1 	.= sprintf("%-*s|", $w + $fwidth[$F_FN_NUM] + 1,
  				   "Functions");
! 	$heading2 	.= sprintf("%-*s ", $w, "Rate");
  	$barlen		+= $w + 1;
! 	# Number of functions
! 	$w = $fwidth[$F_FN_NUM];
  	$format		.= "%${w}s|";
! 	$heading2	.= sprintf("%*s|", $w, "Num");
  	$barlen		+= $w + 1;
! 	# Branch coverage rate
! 	$w = $fwidth[$F_BR_RATE];
  	$format		.= "%${w}s ";
! 	$heading1 	.= sprintf("%-*s", $w + $fwidth[$F_BR_NUM] + 1,
  				   "Branches");
! 	$heading2 	.= sprintf("%-*s ", $w, "Rate");
  	$barlen		+= $w + 1;
! 	# Number of branches
! 	$w = $fwidth[$F_BR_NUM];
  	$format		.= "%${w}s";
! 	$heading2	.= sprintf("%*s", $w, "Num");
  	$barlen		+= $w;
  	# Line end
***************
*** 3070,3079 ****
  		# Assemble line parameters
  		push(@file_data, $print_filename);
- 		push(@file_data, shorten_number($found, $fwidth[$F_LN_NUM]));
  		push(@file_data, $rate);
! 		push(@file_data, shorten_number($fn_found, $fwidth[$F_FN_NUM]));
  		push(@file_data, $fnrate);
! 		push(@file_data, shorten_number($br_found, $fwidth[$F_BR_NUM]));
  		push(@file_data, $brrate);
  
  		# Print assembled line
--- 3070,3079 ----
  		# Assemble line parameters
  		push(@file_data, $print_filename);
  		push(@file_data, $rate);
! 		push(@file_data, shorten_number($found, $fwidth[$F_LN_NUM]));
  		push(@file_data, $fnrate);
! 		push(@file_data, shorten_number($fn_found, $fwidth[$F_FN_NUM]));
  		push(@file_data, $brrate);
+ 		push(@file_data, shorten_number($br_found, $fwidth[$F_BR_NUM]));
  
  		# Print assembled line
***************
*** 3108,3117 ****
  	# Assemble line parameters
  	push(@footer, sprintf("%*s", $strlen, "Total:"));
- 	push(@footer, shorten_number($total_found, $fwidth[$F_LN_NUM]));
  	push(@footer, $rate);
! 	push(@footer, shorten_number($fn_total_found, $fwidth[$F_FN_NUM]));
  	push(@footer, $fnrate);
! 	push(@footer, shorten_number($br_total_found, $fwidth[$F_BR_NUM]));
  	push(@footer, $brrate);
  
  	# Print assembled line
--- 3108,3117 ----
  	# Assemble line parameters
  	push(@footer, sprintf("%*s", $strlen, "Total:"));
  	push(@footer, $rate);
! 	push(@footer, shorten_number($total_found, $fwidth[$F_LN_NUM]));
  	push(@footer, $fnrate);
! 	push(@footer, shorten_number($fn_total_found, $fwidth[$F_FN_NUM]));
  	push(@footer, $brrate);
+ 	push(@footer, shorten_number($br_total_found, $fwidth[$F_BR_NUM]));
  
  	# Print assembled line

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.68,1.69

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

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

Modified Files:
	lcov 
Log Message:
lcov: fix display of total line coverage rate in list view


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** lcov	4 Aug 2010 16:15:19 -0000	1.68
--- lcov	5 Aug 2010 11:22:12 -0000	1.69
***************
*** 3085,3089 ****
  		$rate = "-";
  	} else {
! 		$rate = shorten_rate(100 * $hit / $found,
  				     $fwidth[$F_LN_RATE]);
  	}
--- 3085,3089 ----
  		$rate = "-";
  	} else {
! 		$rate = shorten_rate(100 * $total_hit / $total_found,
  				     $fwidth[$F_LN_RATE]);
  	}

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.67,1.68

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

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

Modified Files:
	lcov 
Log Message:
lcov: more lcov --list improvement

Further improve list output to increase readability.


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** lcov	28 Jul 2010 14:49:47 -0000	1.67
--- lcov	4 Aug 2010 16:15:19 -0000	1.68
***************
*** 2730,2769 ****
  
  
  #
! # get_common_prefix(min_dir, filenames)
! #
! # Return the longest path prefix shared by all filenames. MIN_DIR specifies
! # the minimum number of directories that a filename may have after removing
! # the prefix.
  #
  
! sub get_common_prefix($@)
  {
! 	my ($min_dir, @files) = @_;
! 	my $file;
! 	my @prefix;
! 	my $i;
  
! 	if (scalar(@files) == 1) {
! 		return "";
! 	}
! 	foreach $file (@files) {
! 		my ($v, $d, $f) = splitpath($file);
! 		my @comp = splitdir($d);
  
! 		if (!@prefix) {
! 			@prefix = @comp;
! 			next;
! 		}
! 		for ($i = 0; $i < scalar(@comp) && $i < scalar(@prefix); $i++) {
! 			if ($comp[$i] ne $prefix[$i] ||
! 			    ((scalar(@comp) - ($i + 1)) <= $min_dir)) {
! 				delete(@prefix[$i..scalar(@prefix)]);
! 				last;
  			}
  		}
  	}
  
! 	return catdir(@prefix);
  }
  
--- 2730,2790 ----
  
  
+ # get_prefix(max_width, max_percentage_too_long, path_list)
  #
! # Return a path prefix that satisfies the following requirements:
! # - is shared by more paths in path_list than any other prefix
! # - the percentage of paths which would exceed the given max_width length
! #   after applying the prefix does not exceed max_percentage_too_long
  #
+ # If multiple prefixes satisfy all requirements, the longest prefix is
+ # returned. Return an empty string if no prefix could be found.
  
! sub get_prefix($$@)
  {
! 	my ($max_width, $max_long, @path_list) = @_;
! 	my $path;
! 	my $ENTRY_NUM = 0;
! 	my $ENTRY_LONG = 1;
! 	my %prefix;
  
! 	# Build prefix hash
! 	foreach $path (@path_list) {
! 		my ($v, $d, $f) = splitpath($path);
! 		my @dirs = splitdir($d);
! 		my $p_len = length($path);
! 		my $i;
  
! 		# Remove trailing '/'
! 		pop(@dirs) if ($dirs[scalar(@dirs) - 1] eq '');
! 		for ($i = 0; $i < scalar(@dirs); $i++) {
! 			my $subpath = catpath($v, catdir(@dirs[0..$i]), '');
! 			my $entry = $prefix{$subpath};
! 
! 			$entry = [ 0, 0 ] if (!defined($entry));
! 			$entry->[$ENTRY_NUM]++;
! 			if (($p_len - length($subpath) - 1) > $max_width) {
! 				$entry->[$ENTRY_LONG]++;
  			}
+ 			$prefix{$subpath} = $entry;
  		}
  	}
+ 	# Find suitable prefix (sort descending by two keys: 1. number of
+ 	# entries covered by a prefix, 2. length of prefix)
+ 	foreach $path (sort {($prefix{$a}->[$ENTRY_NUM] ==
+ 			      $prefix{$b}->[$ENTRY_NUM]) ?
+ 				length($b) <=> length($a) :
+ 				$prefix{$b}->[$ENTRY_NUM] <=>
+ 				$prefix{$a}->[$ENTRY_NUM]}
+ 				keys(%prefix)) {
+ 		my ($num, $long) = @{$prefix{$path}};
  
! 		# Check for additional requirement: number of filenames
! 		# that would be too long may not exceed a certain percentage
! 		if ($long <= $num * $max_long / 100) {
! 			return $path;
! 		}
! 	}
! 
! 	return "";
  }
  
***************
*** 2778,2787 ****
  {
  	my ($filename, $width) = @_;
  
! 	return $filename if (length($filename) <= $width);
! 	return substr($filename, 0, $width - 3).'...';
  }
  
  
  #
  # list()
--- 2799,2841 ----
  {
  	my ($filename, $width) = @_;
+ 	my $l = length($filename);
+ 	my $s;
+ 	my $e;
  
! 	return $filename if ($l <= $width);
! 	$e = int(($width - 3) / 2);
! 	$s = $width - 3 - $e;
! 
! 	return substr($filename, 0, $s).'...'.substr($filename, $l - $e);
  }
  
  
+ sub shorten_number($$)
+ {
+ 	my ($number, $width) = @_;
+ 	my $result = sprintf("%*d", $width, $number);
+ 
+ 	return $result if (length($result) <= $width);
+ 	$number = $number / 1000;
+ 	return $result if (length($result) <= $width);
+ 	$result = sprintf("%*dk", $width - 1, $number);
+ 	return $result if (length($result) <= $width);
+ 	$number = $number / 1000;
+ 	$result = sprintf("%*dM", $width - 1, $number);
+ 	return $result if (length($result) <= $width);
+ 	return '#';
+ }
+ 
+ sub shorten_rate($$)
+ {
+ 	my ($rate, $width) = @_;
+ 	my $result = sprintf("%*.1f%%", $width - 3, $rate);
+ 
+ 	return $result if (length($result) <= $width);
+ 	$result = sprintf("%*d%%", $width - 1, $rate);
+ 	return $result if (length($result) <= $width);
+ 	return "#";
+ }
+ 
  #
  # list()
***************
*** 2805,2812 ****
  	my $br_total_found = 0;
  	my $br_total_hit = 0;
  	my $strlen = length("Filename");
  	my $format;
! 	my @heading1;
! 	my @heading2;
  	my @footer;
  	my $barlen;
--- 2859,2867 ----
  	my $br_total_found = 0;
  	my $br_total_hit = 0;
+ 	my $prefix;
  	my $strlen = length("Filename");
  	my $format;
! 	my $heading1;
! 	my $heading2;
  	my @footer;
  	my $barlen;
***************
*** 2815,2877 ****
  	my $brrate;
  	my $lastpath;
  
  	# Get longest filename length
  	foreach $filename (keys(%{$data})) {
  
! 		# Determine maximum length of entries
! 		if ($opt_list_full_path) {
! 			if (length($filename) > $strlen) {
! 				$strlen = length($filename)
  			}
! 		} else {
! 			my ($v, $d, $f) = splitpath($filename);
! 
! 			$strlen = length($f) if (length($f) > $strlen);
  		}
  	}
  	if (!$opt_list_full_path) {
! 		$strlen = 26 if ($strlen > 26);
  	}
  	# Filename
! 	$format		= "   %-${strlen}s    ";
! 	push(@heading1, "");
! 	push(@heading2, "Filename");
! 	$barlen		= 3 + $strlen + 4;
! 	# Line coverage rate
! 	$format		.= "%6s  ";
! 	push(@heading1, "Line");
! 	push(@heading2, "Rate");
! 	$barlen		+= 8;
! 	# Function coverage rate
! 	$format		.= "%6s  ";
! 	push(@heading1, "Func");
! 	push(@heading2, "Rate");
! 	$barlen		+= 8;
! 	# Branch coverage rate
! 	$format		.= "%6s  ";
! 	push(@heading1, "Branch");
! 	push(@heading2, "Rate");
! 	$barlen		+= 8;
  	# Number of lines
! 	$format		.= "%6s  ";
! 	push(@heading1, "");
! 	push(@heading2, "Lines");
! 	$barlen		+= 8;
  	# Number of functions
! 	$format		.= "%5s  ";
! 	push(@heading1, "");
! 	push(@heading2, "Funcs");
! 	$barlen		+= 7;
  	# Number of branches
! 	$format		.= "%5s  ";
! 	push(@heading1, "");
! 	push(@heading2, "Br's");
! 	$barlen		+= 7;
  	# Line end
  	$format		.= "\n";
  
  	# Print heading
! 	printf($format, @heading1);
! 	printf($format, @heading2);
  	print(("="x$barlen)."\n");
  
--- 2870,2991 ----
  	my $brrate;
  	my $lastpath;
+ 	my $F_LN_NUM = 0;
+ 	my $F_LN_RATE = 1;
+ 	my $F_FN_NUM = 2;
+ 	my $F_FN_RATE = 3;
+ 	my $F_BR_NUM = 4;
+ 	my $F_BR_RATE = 5;
+ 	my @fwidth_narrow = (5, 5, 3, 5, 4, 5);
+ 	my @fwidth_wide = (6, 5, 5, 5, 6, 5);
+ 	my @fwidth = @fwidth_wide;
+ 	my $w;
+ 	my $max_width = 80;
+ 	my $max_long = 20;
+ 	my $fwidth_narrow_length;
+ 	my $fwidth_wide_length;
  
+ 	# Calculate total width of narrow fields
+ 	$fwidth_narrow_length = 0;
+ 	foreach $w (@fwidth_narrow) {
+ 		$fwidth_narrow_length += $w + 1;
+ 	}
+ 	# Calculate total width of wide fields
+ 	$fwidth_wide_length = 0;
+ 	foreach $w (@fwidth_wide) {
+ 		$fwidth_wide_length += $w + 1;
+ 	}
+ 	# Get common file path prefix
+ 	$prefix = get_prefix($max_width - $fwidth_narrow_length, $max_long,
+ 			     keys(%{$data}));
+ 	$prefix =~ s/\/$//;
  	# Get longest filename length
  	foreach $filename (keys(%{$data})) {
+ 		if (!$opt_list_full_path) {
+ 			if ((length($prefix) == 0) ||
+ 			    !($filename =~ s/^\Q$prefix\/\E//)) {
+ 				my ($v, $d, $f) = splitpath($filename);
  
! 				$filename = $f;
  			}
! 		}
! 		# Determine maximum length of entries
! 		if (length($filename) > $strlen) {
! 			$strlen = length($filename)
  		}
  	}
  	if (!$opt_list_full_path) {
! 		my $blanks;
! 
! 		$w = $fwidth_wide_length;
! 		# Check if all columns fit into max_width characters
! 		if ($strlen + $fwidth_wide_length > $max_width) {
! 			# Use narrow fields
! 			@fwidth = @fwidth_narrow;
! 			$w = $fwidth_narrow_length;
! 			if (($strlen + $fwidth_narrow_length) > $max_width) {
! 				# Truncate filenames at max width
! 				$strlen = $max_width - $fwidth_narrow_length;
! 			}
! 		}
! 		# Add some blanks between filename and fields if possible
! 		$blanks = int($strlen * 0.5);
! 		$blanks = 4 if ($blanks < 4);
! 		$blanks = 8 if ($blanks > 8);
! 		if (($strlen + $w + $blanks) < $max_width) {
! 			$strlen += $blanks;
! 		} else {
! 			$strlen = $max_width - $w;
! 		}
  	}
  	# Filename
! 	$w = $strlen;
! 	$format		= "%-${w}s|";
! 	$heading1 	= sprintf("%*s|", $w, "");
! 	$heading2 	= sprintf("%-*s|", $w, "Filename");
! 	$barlen		= $w + 1;
  	# Number of lines
! 	$w = $fwidth[$F_LN_NUM];
! 	$format		.= "%${w}s ";
! 	$heading1 	.= sprintf("%-*s |", $w + $fwidth[$F_LN_RATE],
! 				   "Lines");
! 	$heading2 	.= sprintf("%-*s ", $w, "Num");
! 	$barlen		+= $w + 1;
! 	# Line coverage rate
! 	$w = $fwidth[$F_LN_RATE];
! 	$format		.= "%${w}s|";
! 	$heading2	.= sprintf("%*s|", $w, "Rate");
! 	$barlen		+= $w + 1;
  	# Number of functions
! 	$w = $fwidth[$F_FN_NUM];
! 	$format		.= "%${w}s ";
! 	$heading1 	.= sprintf("%-*s|", $w + $fwidth[$F_FN_RATE] + 1,
! 				   "Functions");
! 	$heading2 	.= sprintf("%-*s ", $w, "Num");
! 	$barlen		+= $w + 1;
! 	# Function coverage rate
! 	$w = $fwidth[$F_FN_RATE];
! 	$format		.= "%${w}s|";
! 	$heading2	.= sprintf("%*s|", $w, "Rate");
! 	$barlen		+= $w + 1;
  	# Number of branches
! 	$w = $fwidth[$F_BR_NUM];
! 	$format		.= "%${w}s ";
! 	$heading1 	.= sprintf("%-*s", $w + $fwidth[$F_BR_RATE] + 1,
! 				   "Branches");
! 	$heading2 	.= sprintf("%-*s ", $w, "Num");
! 	$barlen		+= $w + 1;
! 	# Branch coverage rate
! 	$w = $fwidth[$F_BR_RATE];
! 	$format		.= "%${w}s";
! 	$heading2	.= sprintf("%*s", $w, "Rate");
! 	$barlen		+= $w;
  	# Line end
  	$format		.= "\n";
+ 	$heading1	.= "\n";
+ 	$heading2	.= "\n";
  
  	# Print heading
! 	print($heading1);
! 	print($heading2);
  	print(("="x$barlen)."\n");
  
***************
*** 2884,2896 ****
  		$entry = $data->{$filename};
  		if (!$opt_list_full_path) {
! 			my ($v, $d, $f) = splitpath($filename);
! 			my $p = catpath($v, $d, "");
  
  			if (!defined($lastpath) || $lastpath ne $p) {
  				print("\n") if (defined($lastpath));
  				$lastpath = $p;
! 				print(" $lastpath\n");
  			}
! 			$print_filename = shorten_filename($f, $strlen);
  		}
  
--- 2998,3022 ----
  		$entry = $data->{$filename};
  		if (!$opt_list_full_path) {
! 			my $p;
! 
! 			$print_filename = $filename;
! 			if ((length($prefix) == 0) ||
! 			    !($print_filename =~ s/^\Q$prefix\/\E//)) {
! 				my ($v, $d, $f) = splitpath($filename);
! 
! 				$p = catpath($v, $d, "");
! 				$p =~ s/\/$//;
! 				$print_filename = $f;
! 			} else {
! 				$p = $prefix;
! 			}
  
  			if (!defined($lastpath) || $lastpath ne $p) {
  				print("\n") if (defined($lastpath));
  				$lastpath = $p;
! 				print("[$lastpath/]\n");
  			}
! 			$print_filename = shorten_filename($print_filename,
! 							   $strlen);
  		}
  
***************
*** 2924,2928 ****
  			$rate = "-";
  		} else {
! 			$rate = sprintf("%.1f%%", 100 * $hit / $found);
  		}
  		# Determine function coverage rate for this file
--- 3050,3055 ----
  			$rate = "-";
  		} else {
! 			$rate = shorten_rate(100 * $hit / $found,
! 					     $fwidth[$F_LN_RATE]);
  		}
  		# Determine function coverage rate for this file
***************
*** 2930,2935 ****
  			$fnrate = "-";
  		} else {
! 			$fnrate = sprintf("%.1f%%",
! 					  100 * $fn_hit / $fn_found);
  		}
  		# Determine branch coverage rate for this file
--- 3057,3062 ----
  			$fnrate = "-";
  		} else {
! 			$fnrate = shorten_rate(100 * $fn_hit / $fn_found,
! 					     $fwidth[$F_FN_RATE]);
  		}
  		# Determine branch coverage rate for this file
***************
*** 2937,2952 ****
  			$brrate = "-";
  		} else {
! 			$brrate = sprintf("%.1f%%",
! 					  100 * $br_hit / $br_found);
  		}
  
  		# Assemble line parameters
  		push(@file_data, $print_filename);
  		push(@file_data, $rate);
  		push(@file_data, $fnrate);
  		push(@file_data, $brrate);
- 		push(@file_data, $found);
- 		push(@file_data, $fn_found);
- 		push(@file_data, $br_found);
  
  		# Print assembled line
--- 3064,3079 ----
  			$brrate = "-";
  		} else {
! 			$brrate = shorten_rate(100 * $br_hit / $br_found,
! 					     $fwidth[$F_BR_RATE]);
  		}
  
  		# Assemble line parameters
  		push(@file_data, $print_filename);
+ 		push(@file_data, shorten_number($found, $fwidth[$F_LN_NUM]));
  		push(@file_data, $rate);
+ 		push(@file_data, shorten_number($fn_found, $fwidth[$F_FN_NUM]));
  		push(@file_data, $fnrate);
+ 		push(@file_data, shorten_number($br_found, $fwidth[$F_BR_NUM]));
  		push(@file_data, $brrate);
  
  		# Print assembled line
***************
*** 2958,2962 ****
  		$rate = "-";
  	} else {
! 		$rate = sprintf("%.1f%%", 100 * $total_hit / $total_found);
  	}
  	# Determine total function coverage rate
--- 3085,3090 ----
  		$rate = "-";
  	} else {
! 		$rate = shorten_rate(100 * $hit / $found,
! 				     $fwidth[$F_LN_RATE]);
  	}
  	# Determine total function coverage rate
***************
*** 2964,2969 ****
  		$fnrate = "-";
  	} else {
! 		$fnrate = sprintf("%.1f%%",
! 				100 * $fn_total_hit / $fn_total_found);
  	}
  	# Determine total branch coverage rate
--- 3092,3097 ----
  		$fnrate = "-";
  	} else {
! 		$fnrate = shorten_rate(100 * $fn_total_hit / $fn_total_found,
! 				       $fwidth[$F_FN_RATE]);
  	}
  	# Determine total branch coverage rate
***************
*** 2971,2976 ****
  		$brrate = "-";
  	} else {
! 		$brrate = sprintf("%.1f%%",
! 				100 * $br_total_hit / $br_total_found);
  	}
  
--- 3099,3104 ----
  		$brrate = "-";
  	} else {
! 		$brrate = shorten_rate(100 * $br_total_hit / $br_total_found,
! 				       $fwidth[$F_BR_RATE]);
  	}
  
***************
*** 2980,2989 ****
  	# Assemble line parameters
  	push(@footer, sprintf("%*s", $strlen, "Total:"));
  	push(@footer, $rate);
  	push(@footer, $fnrate);
  	push(@footer, $brrate);
- 	push(@footer, $total_found);
- 	push(@footer, $fn_total_found);
- 	push(@footer, $br_total_found);
  
  	# Print assembled line
--- 3108,3117 ----
  	# Assemble line parameters
  	push(@footer, sprintf("%*s", $strlen, "Total:"));
+ 	push(@footer, shorten_number($total_found, $fwidth[$F_LN_NUM]));
  	push(@footer, $rate);
+ 	push(@footer, shorten_number($fn_total_found, $fwidth[$F_FN_NUM]));
  	push(@footer, $fnrate);
+ 	push(@footer, shorten_number($br_total_found, $fwidth[$F_BR_NUM]));
  	push(@footer, $brrate);
  
  	# Print assembled line

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.66,1.67

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

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

Modified Files:
	lcov 
Log Message:
lcov: minor list improvement


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** lcov	28 Jul 2010 13:56:26 -0000	1.66
--- lcov	28 Jul 2010 14:49:47 -0000	1.67
***************
*** 2976,2980 ****
  
  	# Print separator
! 	print(("-"x$barlen)."\n");
  
  	# Assemble line parameters
--- 2976,2980 ----
  
  	# Print separator
! 	print(("="x$barlen)."\n");
  
  	# Assemble line parameters

[Ltp-cvs] utils/analysis/lcov/bin geninfo,1.79,1.80

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

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

Modified Files:
	geninfo 
Log Message:
geninfo: remove unneeded functions


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** geninfo	28 Jul 2010 14:19:09 -0000	1.79
--- geninfo	28 Jul 2010 14:48:25 -0000	1.80
***************
*** 3067,3112 ****
  	return \%capabilities;
  }
- 
- 
- #
- # get_overall_line(found, hit, name_singular, name_plural)
- #
- # Return a string containing overall information for the specified
- # found/hit data.
- #
- 
- sub get_overall_line($$$$)
- {
- 	my ($found, $hit, $name_sn, $name_pl) = @_;
- 	my $name;
- 
- 	return "no data found" if (!defined($found) || $found == 0);
- 	$name = ($found == 1) ? $name_sn : $name_pl;
- 	return sprintf("%.1f%% (%d of %d %s)", $hit * 100 / $found, $hit,
- 		       $found, $name);
- }
- 
- 
- #
- # print_overall_rate(ln_do, ln_found, ln_hit, fn_do, fn_found, fn_hit, br_do
- #                    br_found, br_hit)
- #
- # Print overall coverage rates for the specified coverage types.
- #
- 
- sub print_overall_rate($$$$$$$$$)
- {
- 	my ($ln_do, $ln_found, $ln_hit, $fn_do, $fn_found, $fn_hit,
- 	    $br_do, $br_found, $br_hit) = @_;
- 
- 	info("Overall coverage rate:\n");
- 	info("  lines......: %s\n",
- 	     get_overall_line($ln_found, $ln_hit, "line", "lines"))
- 		if ($ln_do);
- 	info("  functions..: %s\n",
- 	     get_overall_line($fn_found, $fn_hit, "function", "functions"))
- 		if ($fn_do);
- 	info("  branches...: %s\n",
- 	     get_overall_line($br_found, $br_hit, "branch", "branches"))
- 		if ($br_do);
- }
--- 3067,3068 ----

[Ltp-cvs] utils/analysis/lcov/bin geninfo,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-serv12991

Modified Files:
	geninfo 
Log Message:
geninfo: print note on branch coverage data only once


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** geninfo	28 Jul 2010 14:17:59 -0000	1.78
--- geninfo	28 Jul 2010 14:19:09 -0000	1.79
***************
*** 440,443 ****
--- 440,448 ----
  	gen_info($entry);
  }
+ 
+ if ($initial) {
+ 	warn("Note: --initial does not generate branch coverage ".
+ 	     "data\n");
+ }
  info("Finished .info-file creation\n");
  
***************
*** 597,605 ****
  		}
  	}
- 
- 	if ($initial) {
- 		warn("Note: --initial does not generate branch coverage ".
- 		     "data\n");
- 	}
  }
  
--- 602,605 ----

[Ltp-cvs] utils/analysis/lcov/bin geninfo,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-serv12750

Modified Files:
	geninfo 
Log Message:
geninfo: remove incorrect overall coverage rate calculation

geninfo output showing the overall coverage rate of its current
operation is incorrect since it may count lines, functions and
branches for included files multiple times. Remove the output
and associated code until a fixed version is available.


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** geninfo	19 Jul 2010 15:50:02 -0000	1.77
--- geninfo	28 Jul 2010 14:17:59 -0000	1.78
***************
*** 437,473 ****
  
  # Do something
! {
! 	my $total_ln_found	= 0;
! 	my $total_ln_hit	= 0;
! 	my $total_fn_found	= 0;
! 	my $total_fn_hit	= 0;
! 	my $total_br_found	= 0;
! 	my $total_br_hit	= 0;
! 	my $entry;
! 
! 	foreach $entry (@data_directory) {
! 		my $ln_found;
! 		my $ln_hit;
! 		my $fn_found;
! 		my $fn_hit;
! 		my $br_found;
! 		my $br_hit;
! 
! 		# Process files
! 		($ln_found, $ln_hit, $fn_found, $fn_hit, $br_found, $br_hit) =
! 			gen_info($entry);
! 		# Add data
! 		$total_ln_found	+= $ln_found;
! 		$total_ln_hit	+= $ln_hit;
! 		$total_fn_found	+= $fn_found;
! 		$total_fn_hit	+= $fn_hit;
! 		$total_br_found	+= $br_found;
! 		$total_br_hit	+= $br_hit;
! 	}
! 	info("Finished .info-file creation\n");
! 	print_overall_rate(1, $total_ln_found, $total_ln_hit,
! 			   1, $total_fn_found, $total_fn_hit,
! 			   1, $total_br_found, $total_br_hit);
  }
  
  exit(0);
--- 437,444 ----
  
  # Do something
! foreach my $entry (@data_directory) {
! 	gen_info($entry);
  }
+ info("Finished .info-file creation\n");
  
  exit(0);
***************
*** 588,597 ****
  	my $file;
  	my $prefix;
- 	my $total_ln_found	= 0;
- 	my $total_ln_hit	= 0;
- 	my $total_fn_found	= 0;
- 	my $total_fn_hit	= 0;
- 	my $total_br_found	= 0;
- 	my $total_br_hit	= 0;
  	my $type;
  	my $ext;
--- 559,562 ----
***************
*** 625,653 ****
  	# Process all files in list
  	foreach $file (@file_list) {
- 		my $ln_found;
- 		my $ln_hit;
- 		my $fn_found;
- 		my $fn_hit;
- 		my $br_found;
- 		my $br_hit;
- 
  		# Process file
  		if ($initial) {
! 			($ln_found, $ln_hit, $fn_found, $fn_hit,
! 			 $br_found, $br_hit) =
! 				process_graphfile($file, $prefix);
  		} else {
! 			($ln_found, $ln_hit, $fn_found, $fn_hit,
! 			 $br_found, $br_hit) =
! 				process_dafile($file, $prefix);
  		}
- 
- 		# Add data
- 		$total_ln_found	+= $ln_found;
- 		$total_ln_hit	+= $ln_hit;
- 		$total_fn_found	+= $fn_found;
- 		$total_fn_hit	+= $fn_hit;
- 		$total_br_found	+= $br_found;
- 		$total_br_hit	+= $br_hit;
  	}
  
--- 590,599 ----
  	# Process all files in list
  	foreach $file (@file_list) {
  		# Process file
  		if ($initial) {
! 			process_graphfile($file, $prefix);
  		} else {
! 			process_dafile($file, $prefix);
  		}
  	}
  
***************
*** 656,662 ****
  		     "data\n");
  	}
- 
- 	return ($total_ln_found, $total_ln_hit, $total_fn_found, $total_fn_hit,
- 		$total_br_found, $total_br_hit);
  }
  
--- 602,605 ----
***************
*** 784,797 ****
  	my $lines_hit;		# Number of instrumented lines hit
  	my $lines_found;	# Number of instrumented lines found
- 	my $total_ln_found = 0;
- 	my $total_ln_hit = 0;
  	my $funcs_hit;		# Number of instrumented functions hit
  	my $funcs_found;	# Number of instrumented functions found
- 	my $total_fn_found = 0;
- 	my $total_fn_hit = 0;
  	my $br_hit;
  	my $br_found;
- 	my $total_br_found = 0;
- 	my $total_br_hit = 0;
  	my $source;		# gcov source header information
  	my $object;		# gcov object header information
--- 727,734 ----
***************
*** 1140,1147 ****
  		}
  
- 		# Add to totals
- 		$total_fn_found += $funcs_found;
- 		$total_fn_hit += $funcs_hit;
- 
  		# Write coverage information for each instrumented branch:
  		#
--- 1077,1080 ----
***************
*** 1167,1174 ****
  		}
  
- 		# Add to totals
- 		$total_br_found += $br_found;
- 		$total_br_hit += $br_hit;
- 
  		# Reset line counters
  		$line_number = 0;
--- 1100,1103 ----
***************
*** 1206,1213 ****
  		print(INFO_HANDLE "end_of_record\n");
  
- 		# Add to totals
- 		$total_ln_found += $lines_found;
- 		$total_ln_hit += $lines_hit;
- 
  		# Remove .gcov file after processing
  		unlink($gcov_file);
--- 1135,1138 ----
***************
*** 1231,1237 ****
  	# Change back to initial directory
  	chdir($cwd);
- 
- 	return ($total_ln_found, $total_ln_hit, $total_fn_found, $total_fn_hit,
- 		$total_br_found, $total_br_hit);
  }
  
--- 1156,1159 ----
***************
*** 2091,2098 ****
  	my $instr;
  	my $filename;
- 	my $ln_found = 0;
- 	my $total_ln_found = 0;
- 	my $fn_found = 0;
- 	my $total_fn_found = 0;
  	local *INFO_HANDLE;
  
--- 2013,2016 ----
***************
*** 2196,2205 ****
  			}
  			# Print function summary
! 			$fn_found = scalar(@functions);
! 			print(INFO_HANDLE "FNF:$fn_found\n");
  			print(INFO_HANDLE "FNH:0\n");
- 
- 			# Add to totals
- 			$total_fn_found += $fn_found;
  		}
  		# Print zero line coverage data
--- 2114,2119 ----
  			}
  			# Print function summary
! 			print(INFO_HANDLE "FNF:".scalar(@functions)."\n");
  			print(INFO_HANDLE "FNH:0\n");
  		}
  		# Print zero line coverage data
***************
*** 2208,2219 ****
  		}
  		# Print line summary
! 		$ln_found = scalar(@{$instr->{$filename}});
! 		print(INFO_HANDLE "LF:$ln_found\n");
  		print(INFO_HANDLE "LH:0\n");
  
  		print(INFO_HANDLE "end_of_record\n");
- 
- 		# Add to totals
- 		$total_ln_found += $ln_found;
  	}
  	if (!($output_filename && ($output_filename eq "-")))
--- 2122,2129 ----
  		}
  		# Print line summary
! 		print(INFO_HANDLE "LF:".scalar(@{$instr->{$filename}})."\n");
  		print(INFO_HANDLE "LH:0\n");
  
  		print(INFO_HANDLE "end_of_record\n");
  	}
  	if (!($output_filename && ($output_filename eq "-")))
***************
*** 2221,2226 ****
  		close(INFO_HANDLE);
  	}
- 
- 	return ($ln_found, 0, $fn_found, 0, 0, 0);
  }
  
--- 2131,2134 ----

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.65,1.66

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

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

Modified Files:
	lcov 
Log Message:
lcov: more list output fixes


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** lcov	28 Jul 2010 13:52:01 -0000	1.65
--- lcov	28 Jul 2010 13:56:26 -0000	1.66
***************
*** 2805,2809 ****
  	my $br_total_found = 0;
  	my $br_total_hit = 0;
! 	my $strlen = length("Total:");
  	my $format;
  	my @heading1;
--- 2805,2809 ----
  	my $br_total_found = 0;
  	my $br_total_hit = 0;
! 	my $strlen = length("Filename");
  	my $format;
  	my @heading1;
***************
*** 2837,2841 ****
  	push(@heading1, "");
  	push(@heading2, "Filename");
! 	$barlen		= 1 + $strlen + 4;
  	# Line coverage rate
  	$format		.= "%6s  ";
--- 2837,2841 ----
  	push(@heading1, "");
  	push(@heading2, "Filename");
! 	$barlen		= 3 + $strlen + 4;
  	# Line coverage rate
  	$format		.= "%6s  ";

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.64,1.65

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

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

Modified Files:
	lcov 
Log Message:
lcov: fix list output

Fix list output for directories with short filenames.


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** lcov	26 Jul 2010 13:33:18 -0000	1.64
--- lcov	28 Jul 2010 13:52:01 -0000	1.65
***************
*** 2805,2809 ****
  	my $br_total_found = 0;
  	my $br_total_hit = 0;
! 	my $strlen = 0;
  	my $format;
  	my @heading1;
--- 2805,2809 ----
  	my $br_total_found = 0;
  	my $br_total_hit = 0;
! 	my $strlen = length("Total:");
  	my $format;
  	my @heading1;

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.63,1.64

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

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

Modified Files:
	lcov 
Log Message:
lcov: fix problem when using --initial and --kernel-directory

Fix a problem in lcov that resulted in --kernel-directory options
being ignored when specifying --initial at the same time.

Reported by hj...@re....


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** lcov	19 Jul 2010 14:27:08 -0000	1.63
--- lcov	26 Jul 2010 13:33:18 -0000	1.64
***************
*** 1111,1114 ****
--- 1111,1115 ----
  	my $build;
  	my $source;
+ 	my @params;
  
  	if (defined($base_directory)) {
***************
*** 1126,1130 ****
  	# Build directory needs to be passed to geninfo
  	$base_directory = $build;
! 	lcov_geninfo($build);
  }
  
--- 1127,1138 ----
  	# Build directory needs to be passed to geninfo
  	$base_directory = $build;
! 	if (@kernel_directory) {
! 		foreach my $dir (@kernel_directory) {
! 			push(@params, "$build/$dir");
! 		}
! 	} else {
! 		push(@params, $build);
! 	}
! 	lcov_geninfo(@params);
  }
  

[Ltp-cvs] utils/analysis/lcov/bin genhtml,1.49,1.50

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

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

Modified Files:
	genhtml 
Log Message:
genhtml: change wording for branches which were not executed

Since gcov sometimes reports both branches which were never executed
as well as branches which were executed in a single block, the wording
of the HTML alt text needs to be adjusted accordingly.


Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** genhtml	19 Jul 2010 15:23:10 -0000	1.49
--- genhtml	19 Jul 2010 16:06:15 -0000	1.50
***************
*** 3800,3806 ****
  				$class	= "branchNoExec";
  				$text	= " # ";
! 				$title	= "Block containing branch ".
! 					  "$br_num was never ".
! 					  "executed";
  			} elsif ($taken == 0) {
  				$class	= "branchNoCov";
--- 3800,3804 ----
  				$class	= "branchNoExec";
  				$text	= " # ";
! 				$title	= "Branch $br_num was not executed";
  			} elsif ($taken == 0) {
  				$class	= "branchNoCov";

[Ltp-cvs] utils/analysis/lcov/bin geninfo,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-serv2145

Modified Files:
	geninfo 
Log Message:
geninfo: handle branches in unnamed blocks

gcov will sometimes report branches outside of a block. In that case,
account these branches to a special block so that they are not
accidentally merged with subsequently reported blocks.


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** geninfo	7 Jun 2010 12:22:18 -0000	1.76
--- geninfo	19 Jul 2010 15:50:02 -0000	1.77
***************
*** 88,91 ****
--- 88,93 ----
  our $BR_VEC_WIDTH	= 32;
  
+ our $UNNAMED_BLOCK	= 9999;
+ 
  # Prototypes
  sub print_usage(*);
***************
*** 1561,1565 ****
  	my $exclude_flag = 0;
  	my $exclude_line = 0;
! 	my $last_block = 0;
  	my $last_line = 0;
  	local *INPUT;
--- 1563,1567 ----
  	my $exclude_flag = 0;
  	my $exclude_line = 0;
! 	my $last_block = $UNNAMED_BLOCK;
  	my $last_line = 0;
  	local *INPUT;
***************
*** 1680,1684 ****
  
  				$last_line = $line;
! 				$last_block = 0;
  				# Check for exclusion markers
  				if (!$no_markers) {
--- 1682,1686 ----
  
  				$last_line = $line;
! 				$last_block = $UNNAMED_BLOCK;
  				# Check for exclusion markers
  				if (!$no_markers) {

[Ltp-cvs] utils/analysis/lcov/bin genhtml,1.48,1.49

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

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

Modified Files:
	genhtml 
Log Message:
genhtml: fix branch formatting code

Fix the vertical alignment of the HTML representation of branches in
the source code view.


Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** genhtml	19 Jul 2010 12:12:43 -0000	1.48
--- genhtml	19 Jul 2010 15:23:10 -0000	1.49
***************
*** 3759,3763 ****
  		# Split the block into several lines
  		foreach $branch (@{$block}) {
! 			if ($line_len + $branch->[$BR_LEN] > $br_field_width) {
  				# Start a new line
  				if (($line_len + 1 <= $br_field_width) &&
--- 3759,3763 ----
  		# Split the block into several lines
  		foreach $branch (@{$block}) {
! 			if ($line_len + $branch->[$BR_LEN] >= $br_field_width) {
  				# Start a new line
  				if (($line_len + 1 <= $br_field_width) &&

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.62,1.63

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

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

Modified Files:
	lcov 
Log Message:
lcov: improve list output

Improve list output by separating directory and file names. Also provide
an option to show full path names.


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** lcov	29 Jan 2010 11:07:25 -0000	1.62
--- lcov	19 Jul 2010 14:27:08 -0000	1.63
***************
*** 65,69 ****
  use File::Find;
  use File::Temp qw /tempdir/;
! use File::Spec::Functions qw /abs2rel canonpath catdir catfile 
  			      file_name_is_absolute rootdir splitdir splitpath/;
  use Getopt::Long;
--- 65,69 ----
  use File::Find;
  use File::Temp qw /tempdir/;
! use File::Spec::Functions qw /abs2rel canonpath catdir catfile catpath
  			      file_name_is_absolute rootdir splitdir splitpath/;
  use Getopt::Long;
***************
*** 183,186 ****
--- 183,188 ----
  our $opt_derive_func_data;
  our $opt_debug;
+ our $opt_list_full_path;
+ our $opt_no_list_full_path;
  our $ln_overall_found;
  our $ln_overall_hit;
***************
*** 224,228 ****
  	apply_config({
  		"lcov_gcov_dir"		=> \$gcov_dir,
! 		"lcov_tmp_dir"		=> \$tmp_dir});
  }
  
--- 226,232 ----
  	apply_config({
  		"lcov_gcov_dir"		=> \$gcov_dir,
! 		"lcov_tmp_dir"		=> \$tmp_dir,
! 		"lcov_list_full_path"	=> \$opt_list_full_path,
! 	});
  }
  
***************
*** 260,263 ****
--- 264,269 ----
  		"derive-func-data" => \$opt_derive_func_data,
  		"debug" => \$opt_debug,
+ 		"list-full-path" => \$opt_list_full_path,
+ 		"no-list-full-path" => \$opt_no_list_full_path,
  		))
  {
***************
*** 279,282 ****
--- 285,294 ----
  		$no_compat_libtool = undef;
  	}
+ 
+ 	if (defined($opt_no_list_full_path))
+ 	{
+ 		$opt_list_full_path = ($opt_no_list_full_path ? 0 : 1);
+ 		$opt_no_list_full_path = undef;
+ 	}
  }
  
***************
*** 471,474 ****
--- 483,487 ----
        --no-markers                Ignore exclusion markers in source code
        --derive-func-data          Generate function data from line data
+       --list-full-path            Print full path during a list operation
  
  For more information see: $lcov_url
***************
*** 2759,2764 ****
  
  	return $filename if (length($filename) <= $width);
! 	return '...'.substr($filename, length($filename) - $width + 3,
! 			    $width - 3);
  }
  
--- 2772,2776 ----
  
  	return $filename if (length($filename) <= $width);
! 	return substr($filename, 0, $width - 3).'...';
  }
  
***************
*** 2785,2789 ****
  	my $br_total_found = 0;
  	my $br_total_hit = 0;
- 	my $prefix;
  	my $strlen = 0;
  	my $format;
--- 2797,2800 ----
***************
*** 2795,2815 ****
  	my $fnrate;
  	my $brrate;
  
- 	# Get common file path prefix
- 	$prefix = get_common_prefix(1, keys(%{$data}));
- 	$prefix = "" if ($prefix eq "/");
  	# Get longest filename length
  	foreach $filename (keys(%{$data})) {
  		# Determine maximum length of entries
! 		$strlen = length($filename) if (length($filename) > $strlen);
  	}
! 	# Print header
! 	if (length($prefix) > 0) {
! 		info("Common directory: $prefix\n");
! 		$strlen -= length($prefix) + 1;
  	}
- 	$strlen = 28 if ($strlen > 28);
  	# Filename
! 	$format		= " %-${strlen}s    ";
  	push(@heading1, "");
  	push(@heading2, "Filename");
--- 2806,2830 ----
  	my $fnrate;
  	my $brrate;
+ 	my $lastpath;
  
  	# Get longest filename length
  	foreach $filename (keys(%{$data})) {
+ 
  		# Determine maximum length of entries
! 		if ($opt_list_full_path) {
! 			if (length($filename) > $strlen) {
! 				$strlen = length($filename)
! 			}
! 		} else {
! 			my ($v, $d, $f) = splitpath($filename);
! 
! 			$strlen = length($f) if (length($f) > $strlen);
! 		}
  	}
! 	if (!$opt_list_full_path) {
! 		$strlen = 26 if ($strlen > 26);
  	}
  	# Filename
! 	$format		= "   %-${strlen}s    ";
  	push(@heading1, "");
  	push(@heading2, "Filename");
***************
*** 2857,2862 ****
--- 2872,2889 ----
  	{
  		my @file_data;
+ 		my $print_filename = $filename;
  
  		$entry = $data->{$filename};
+ 		if (!$opt_list_full_path) {
+ 			my ($v, $d, $f) = splitpath($filename);
+ 			my $p = catpath($v, $d, "");
+ 
+ 			if (!defined($lastpath) || $lastpath ne $p) {
+ 				print("\n") if (defined($lastpath));
+ 				$lastpath = $p;
+ 				print(" $lastpath\n");
+ 			}
+ 			$print_filename = shorten_filename($f, $strlen);
+ 		}
  
  		(undef, undef, undef, undef, undef, undef, undef, undef,
***************
*** 2885,2892 ****
  		$br_total_hit += $br_hit;
  
- 		# Shorten filename by common prefix
- 		$filename =~ s/^\Q$prefix\/\E// if (length($prefix) > 0);
- 		$filename = shorten_filename($filename, $strlen);
- 
  		# Determine line coverage rate for this file
  		if ($found == 0) {
--- 2912,2915 ----
***************
*** 2911,2915 ****
  
  		# Assemble line parameters
! 		push(@file_data, $filename);
  		push(@file_data, $rate);
  		push(@file_data, $fnrate);
--- 2934,2938 ----
  
  		# Assemble line parameters
! 		push(@file_data, $print_filename);
  		push(@file_data, $rate);
  		push(@file_data, $fnrate);

[Ltp-cvs] utils/analysis/lcov/man lcov.1, 1.20, 1.21 lcovrc.5, 1.12, 1.13

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

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

Modified Files:
	lcov.1 lcovrc.5 
Log Message:
lcov: improve list output

Improve list output by separating directory and file names. Also provide
an option to show full path names.


Index: lcov.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcov.1,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** lcov.1	29 Jan 2010 10:09:53 -0000	1.20
--- lcov.1	19 Jul 2010 14:27:08 -0000	1.21
***************
*** 62,65 ****
--- 62,67 ----
  .br
  .RB [ \-q | \-\-quiet ]
+ .RB [ \-\-list\-full\-path ]
+ .RB [ \-\-no\-list\-full\-path ]
  .br
  .RE
***************
*** 499,502 ****
--- 501,517 ----
  .RE
  
+ .B \-\-list\-full\-path
+ .br
+ .B \-\-no\-list\-full\-path
+ .br
+ .RS
+ Specify whether to show full paths during list operation.
+ 
+ Use \-\-list\-full\-path to show full paths during list operation
+ or \-\-no\-list\-full\-path to show shortened paths. Paths are
+ .B shortened
+ by default.
+ .RE
+ 
  .B \-\-no\-markers
  .br

Index: lcovrc.5
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcovrc.5,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lcovrc.5	29 Jan 2010 10:09:53 -0000	1.12
--- lcovrc.5	19 Jul 2010 14:27:08 -0000	1.13
***************
*** 174,177 ****
--- 174,182 ----
  lcov_tmp_dir = /tmp
  .br
+ 
+ # Show full paths during list operation if non\-zero
+ .br
+ lcov_list_full_path = 0
+ .br
  .PP
  
***************
*** 533,536 ****
--- 538,554 ----
  .PP
  
+ .BR lcov_list_full_path " ="
+ .IR 0 | 1
+ .IP
+ If non-zero, print the full path to source code files during a list operation.
+ .br
+ 
+ This option corresponds to the \-\-list\-full\-path option of
+ .BR lcov .
+ .br
+ 
+ Default is 0.
+ .PP
+ 
  .SH FILES