mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add lcov --initial

Browse Source 
By just running lcov on the produced .gcda data files, we don't account
for source files that are not touched by tests at all.  To fix that, run
lcov --initial to create a base line info file with all zero counters,
and merge that with the actual counters when creating the final report.

Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
This commit is contained in:
Peter Eisentraut 2017-08-10 23:33:47 -04:00
parent 22d9764646
commit 4bb5a2536b
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -21,7 +21,7 @@ objfiles.txt
*.gcda *.gcda
*.gcov *.gcov
*.gcov.out *.gcov.out
lcov.info lcov*.info
coverage/ coverage/
coverage-html-stamp coverage-html-stamp
*.vcproj *.vcproj

25
src/Makefile.global.in
View File

@ -869,8 +869,13 @@ endif # enable_nls
# gcov from foo.gcda (by "make coverage") # gcov from foo.gcda (by "make coverage")
# foo.c.gcov.out stdout captured when foo.c.gcov is created, mildly # foo.c.gcov.out stdout captured when foo.c.gcov is created, mildly
# interesting # interesting
# lcov.info lcov tracefile, built from gcda files in one directory, # lcov_test.info
# lcov tracefile, built from gcda files in one directory,
# later collected by "make coverage-html" # later collected by "make coverage-html"
# lcov_base.info
# tracefile for zero counters for every file, so that
# even files that are not touched by tests are counted
# for the overall coverage rate
ifeq ($(enable_coverage), yes) ifeq ($(enable_coverage), yes)
@ -888,15 +893,23 @@ coverage: $(local_gcda_files:.gcda=.c.gcov)
.PHONY: coverage-html .PHONY: coverage-html
coverage-html: coverage-html-stamp coverage-html: coverage-html-stamp
coverage-html-stamp: lcov.info coverage-html-stamp: lcov_base.info lcov_test.info
rm -rf coverage rm -rf coverage
$(GENHTML) --show-details --legend --output-directory=coverage --title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir) $< $(GENHTML) --show-details --legend --output-directory=coverage --title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir) $^
touch $@ touch $@
LCOV += --gcov-tool $(GCOV)
LCOVFLAGS = --no-external
all_gcno_files = $(shell find . -name '*.gcno' -print)
lcov_base.info: $(all_gcno_files)
$(LCOV) $(LCOVFLAGS) -c -i -d . -o $@
all_gcda_files = $(shell find . -name '*.gcda' -print) all_gcda_files = $(shell find . -name '*.gcda' -print)
lcov.info: $(all_gcda_files) lcov_test.info: $(all_gcda_files)
$(LCOV) -d . -c -o $@ $(LCOVFLAGS) --gcov-tool $(GCOV) --no-external $(LCOV) $(LCOVFLAGS) -c -d . -o $@
# hook for clean-up # hook for clean-up
@ -905,7 +918,7 @@ clean distclean maintainer-clean: clean-coverage
.PHONY: clean-coverage .PHONY: clean-coverage
clean-coverage: clean-coverage:
rm -rf coverage coverage-html-stamp rm -rf coverage coverage-html-stamp
rm -f *.gcda *.gcno lcov.info *.gcov .*.gcov *.gcov.out rm -f *.gcda *.gcno lcov*.info *.gcov .*.gcov *.gcov.out
# User-callable target to reset counts between test runs # User-callable target to reset counts between test runs