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

Modified Files:
	geninfo 
Log Message:
lcov: fix problem with relative path names

Fix a problem where coverage data is missing because gcov produces
output files starting with a dot.

Problem reported by wes...@op....


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** geninfo	28 Feb 2010 20:57:37 -0000	1.74
--- geninfo	1 Jun 2010 13:48:29 -0000	1.75
***************
*** 724,727 ****
--- 724,753 ----
  
  #
+ # get_filenames(directory, pattern)
+ #
+ # Return a list of filenames found in directory which match the specified
+ # pattern.
+ #
+ # Die on error.
+ #
+ 
+ sub get_filenames($$)
+ {
+ 	my ($dirname, $pattern) = @_;
+ 	my @result;
+ 	my $directory;
+ 	local *DIR;
+ 
+ 	opendir(DIR, $dirname) or
+ 		die("ERROR: cannot read directory $dirname\n");
+ 	while ($directory = readdir(DIR)) {
+ 		push(@result, $directory) if ($directory =~ /$pattern/);
+ 	}
+ 	closedir(DIR);
+ 
+ 	return @result;
+ }
+ 
+ #
  # process_dafile(da_filename, dir)
  #
***************
*** 919,923 ****
  
  	# Collect data from resulting .gcov files and create .info file
! 	@gcov_list = glob("*.gcov");
  
  	# Check for files
--- 945,949 ----
  
  	# Collect data from resulting .gcov files and create .info file
! 	@gcov_list = get_filenames('.', '\.gcov$');
  
  	# Check for files