Rev 11292: Fix lcov in file:///home/jelmer/bzr.samba/SAMBA_4_0/

Jelmer Vernooij jelmer at samba.org
Mon Jan 22 23:41:03 GMT 2007


------------------------------------------------------------
revno: 11292
revision-id: jelmer at samba.org-20070122234054-jp4r2wzkgn0t954k
parent: svn-v2:20959 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-23 00:40:54 +0100
message:
  Fix lcov
modified:
  .bzrignore                     svn-v2:17811 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-.bzrignore
  source/torture/config.mk       svn-v2:860 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fconfig.mk
=== modified file '.bzrignore'
--- a/.bzrignore	2007-01-22 23:38:55 +0000
+++ b/.bzrignore	2007-01-22 23:40:54 +0000
@@ -160,3 +160,4 @@
 source/pidl/pm_to_blib
 source/coverage
 source/st
+source/samba.info

=== modified file 'source/torture/config.mk'
--- a/source/torture/config.mk	2007-01-22 18:16:01 +0000
+++ b/source/torture/config.mk	2007-01-22 23:40:54 +0000
@@ -336,20 +336,18 @@
 GCOV_FLAGS = -ftest-coverage -fprofile-arcs
 GCOV_LIBS = -lgcov
 
-gcov: 
+test_cov:
 	@$(MAKE) test \
 		HOSTCC_CFLAGS="$(HOSTCC_CFLAGS) $(GCOV_FLAGS)" \
 		CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
 		LDFLAGS="$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)"
+
+gcov: test_cov
 	for I in $(sort $(dir $(ALL_OBJS))); \
 		do $(GCOV) -p -o $$I $$I/*.c; \
 	done
 
-lcov:
-	@$(MAKE) test \
-		HOSTCC_CFLAGS="$(HOSTCC_CFLAGS) $(GCOV_FLAGS)" \
-		CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
-		LDFLAGS="$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)"
-	rm **/{lex,parse}.{gcda,gcno}
+lcov: test_cov
+	rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
 	lcov --base-directory `pwd` --directory . --capture --output-file samba.info
 	genhtml -o coverage samba.info



More information about the samba-cvs mailing list