summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-02-19 14:44:10 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-02-19 14:44:10 +1100
commit5842df9d0fb71430d1bcda1c4c748589b38ecb00 (patch)
treef083a5d69fc9e98eac3d52b449c0c0f896aedd53 /source4/torture
parent0fbf1de763ed0a90fb9e73c563cf7025c4bffb62 (diff)
downloadsamba-5842df9d0fb71430d1bcda1c4c748589b38ecb00.tar.gz
samba-5842df9d0fb71430d1bcda1c4c748589b38ecb00.tar.bz2
samba-5842df9d0fb71430d1bcda1c4c748589b38ecb00.zip
To partially simplfy our gcov handling, move to the new --coverage option.
Andrew Bartlett (This used to be commit 7e49f75ee21adec321e0935c9cd4c2a96d7ef6d1)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/config.mk19
1 files changed, 10 insertions, 9 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 7ab4658dc1..32085400b7 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -369,21 +369,20 @@ MANPAGE = man/locktest.1
# End BINARY locktest
#################################
-GCOV_CFLAGS = -ftest-coverage -fprofile-arcs
-GCOV_LDFLAGS = $(GCOV_CFLAGS) -lgcov
+GCOV_FLAGS = --coverage
COV_TARGET = test
COV_VARS = \
- CFLAGS="$(CFLAGS) $(GCOV_CFLAGS)" \
- BNLD_FLAGS="$(BNLD_FLAGS) $(GCOV_LDFLAGS)" \
- SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_LDFLAGS)" \
- MDLD_FLAGS="$(MDLD_FLAGS) $(GCOV_LDFLAGS)" \
- HOSTCC_FLAGS="$(HOSTCC_FLAGS) $(GCOV_CFLAGS)" \
- HOSTLD_FLAGS="$(HOSTLD_FLAGS) $(GCOV_LDFLAGS)"
+ CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
+ BNLD_FLAGS="$(BNLD_FLAGS) $(GCOV_FLAGS)" \
+ SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_FLAGS)" \
+ MDLD_FLAGS="$(MDLD_FLAGS) $(GCOV_FLAGS)" \
+ HOSTCC_FLAGS="$(HOSTCC_FLAGS) $(GCOV_FLAGS)" \
+ HOSTLD_FLAGS="$(HOSTLD_FLAGS) $(GCOV_FLAGS)"
test_cov:
- @$(MAKE) $(COV_TARGET) $(COV_VARS)
+ -$(MAKE) $(COV_TARGET) $(COV_VARS)
gcov: test_cov
for I in $(sort $(dir $(ALL_OBJS))); \
@@ -395,10 +394,12 @@ lcov-split:
@$(MAKE) $(COV_TARGET) $(COV_VARS) \
TEST_OPTIONS="--analyse-cmd=\"lcov --base-directory `pwd` --directory . --capture --output-file samba.info -t\""
-rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
+ -rm lib/policy/*/{lex,parse}.{gcda,gcno}
genhtml -o coverage samba.info
lcov: test_cov
-rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
+ -rm lib/policy/*/{lex,parse}.{gcda,gcno}
lcov --base-directory `pwd` --directory . --capture --output-file samba.info
genhtml -o coverage samba.info