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