[Ltp-cvs] utils/analysis/lcov/bin geninfo, 1.26, 1.27 lcov, 1.16, 1.17

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

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1066

Modified Files:
	geninfo lcov 
Log Message:
lcov:
- re-added libtool compatibility workaround patch by th...@ap...
- added new lcov/geninfo-option --compat_libtool to activate libtool
  compatibility patch


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** geninfo	5 Apr 2006 10:10:04 -0000	1.26
--- geninfo	8 Jan 2007 17:07:21 -0000	1.27
***************
*** 105,108 ****
--- 105,109 ----
  our $nochecksum;
  our $preserve_paths;
+ our $compat_libtool;
  our $adjust_testname = (`uname -m` =~ /^s390/); # Always on on s390
  our $config;		# Configuration file contents
***************
*** 148,152 ****
  		"quiet" => \$quiet,
  		"help" => \$help,
! 		"follow" => \$follow
  		))
  {
--- 149,154 ----
  		"quiet" => \$quiet,
  		"help" => \$help,
! 		"follow" => \$follow,
! 		"compat_libtool" => \$compat_libtool
  		))
  {
***************
*** 306,309 ****
--- 308,312 ----
    -n, --no-checksum                 Do not calculate checksum for each line
    -b, --base-directory DIR          Use DIR as base directory for relative paths
+       --compat_libtool              Assume libtool environment
  
  See $lcov_url for more information about this tool.
***************
*** 386,389 ****
--- 389,393 ----
  	my $da_filename;	# Name of data file to process
  	my $da_dir;		# Directory of data file
+ 	my $source_dir;		# Directory of source file
  	my $da_basename;	# data filename without ".da/.gcda" extension
  	my $bb_filename;	# Name of respective graph file
***************
*** 416,424 ****
  	($da_dir, $da_basename) = split_filename($da_filename);
  
! 	# Check for writable $da_dir (gcov will try to write files there)
! 	stat($da_dir);
! 	if (!-w _)
! 	{
! 		die("ERROR: cannot write to directory $da_dir!\n");
  	}
  
--- 420,428 ----
  	($da_dir, $da_basename) = split_filename($da_filename);
  
! 	# avoid files from .libs dirs 	 
! 	if ($compat_libtool && $da_dir =~ m/(.*)\/\.libs$/) {
! 		$source_dir = $1;
! 	} else {
! 		$source_dir = $da_dir;
  	}
  
***************
*** 439,443 ****
  	else
  	{
! 		$base_dir = $da_dir;
  	}
  
--- 443,454 ----
  	else
  	{
! 		$base_dir = $source_dir;
! 	}
! 
! 	# Check for writable $base_dir (gcov will try to write files there)
! 	stat($base_dir);
! 	if (!-w _)
! 	{
! 		die("ERROR: cannot write to directory $base_dir!\n");
  	}
  

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** lcov	14 Nov 2006 11:45:17 -0000	1.16
--- lcov	8 Jan 2007 17:07:21 -0000	1.17
***************
*** 148,151 ****
--- 148,152 ----
  our $diff_path = "";	# Path removed from tracefile when applying diff
  our $base_directory;	# Base directory (cwd of gcc during compilation)
+ our $compat_libtool;	# Specify to work with libtool build environment
  our $config;		# Configuration file contents
  chomp($cwd);
***************
*** 204,208 ****
  		"follow" => \$follow,
  		"path=s" => \$diff_path,
! 		"base-directory=s" => \$base_directory
  		))
  {
--- 205,210 ----
  		"follow" => \$follow,
  		"path=s" => \$diff_path,
! 		"base-directory=s" => \$base_directory,
! 		"compat_libtool" => \$compat_libtool
  		))
  {
***************
*** 347,350 ****
--- 349,353 ----
        --strip DEPTH               Strip initial DEPTH directory levels in diff
        --path PATH                 Strip PATH from tracefile when applying diff
+       --compat_libtool            Assume libtool environment
  
  See $lcov_url for more information about this tool.
***************
*** 464,467 ****
--- 467,474 ----
  		@param = (@param, "--base-directory", $base_directory);
  	}
+ 	if ($compat_libtool)
+ 	{
+ 		@param = (@param, "--compat_libtool");
+ 	}
  
  	system(@param);