r20961: Fix lcov

diff --git a/.bzrignore b/.bzrignore
index bf51f9ab9f823e2a8514780883058cc5884eec29..fc9b4646218434fb5466c80fb7afd1f3fa531335 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -160,3 +160,4 @@ source/pidl/blib
 source/pidl/pm_to_blib
 source/coverage
 source/st
+source/samba.info

diff --git a/source/torture/config.mk b/source/torture/config.mk
index 651f09dc25bf1127e1e1f745d0df5b554b0970d5..82fbf41ed12dfce88eedb1dd6b99b9027ac9289f 100644 (file)
--- a/source/torture/config.mk
+++ b/source/torture/config.mk
@@ -336,20 +336,18 @@ MANPAGE = man/locktest.1
 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