[Ltp-cvs] utils/analysis/lcov/bin geninfo,1.121,1.122

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

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

Modified Files:
	geninfo 
Log Message:
geninfo: fix --no-external not working with --initial

When running lcov --capture --initial together with --no-external.
the --no-external has no effect. Fix this by applying the external
filtering also for graph files.

Reported-by: mal...@gm...


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** geninfo	2 May 2013 11:02:23 -0000	1.121
--- geninfo	2 Aug 2013 07:29:20 -0000	1.122
***************
*** 2277,2280 ****
--- 2277,2289 ----
  		my $linedata;
  
+ 		# Skip external files if requested
+ 		if (!$opt_external) {
+ 			if (is_external($filename)) {
+ 				info("  ignoring data for external file ".
+ 				     "$filename\n");
+ 				next;
+ 			}
+ 		}
+ 
  		print(INFO_HANDLE "SF:$filename\n");