NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit504923a

committed

Run only top-level recursive lcov

This is the way lcov was intended to be used. It is much faster andmore robust and makes the makefiles simpler than running it in eachsubdirectory.The previous coding ran gcov before lcov, but that is useless becauselcov/geninfo call gcov internally and use that information. Moreover,this led to complications and failures during parallel make. Thisseparates the two targets: You either use "make coverage" to gettextual output from gcov or "make coverage-html" to get an HTML reportvia lcov. (Using both is still problematic because they write the sameoutput files.)Reviewed-by: Michael Paquier <michael.paquier@gmail.com>

1 parent7769fc0 commit504923aCopy full SHA for 504923a

File tree

3 files changed

+30

-12

lines changed

3 files changed

+30

-12

lines changed

`‎.gitignore`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ objfiles.txt`
`23`	`23`	`*.gcov.out`
`24`	`24`	`lcov.info`
`25`	`25`	`coverage/`
	`26`	`+coverage-html-stamp`
`26`	`27`	`*.vcproj`
`27`	`28`	`*.vcxproj`
`28`	`29`	`win32ver.rc`

`‎doc/src/sgml/regress.sgml`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -706,6 +706,19 @@ make coverage-html`
`706`	`706`	`The <command>make</command> commands also work in subdirectories.`
`707`	`707`	`</para>`
`708`	`708`
	`709`	`+ <para>`
	`710`	`+ If you don't have <command>lcov</command> or prefer text output over an`
	`711`	`+ HTML report, you can also run`
	`712`	`+<screen>`
	`713`	`+make coverage`
	`714`	`+</screen>`
	`715`	`+ instead of <literal>make coverage-html</literal>, which will`
	`716`	`+ produce <filename>.gcov</filename> output files for each source file`
	`717`	`+ relevant to the test. (<literal>make coverage</literal> and <literal>make`
	`718`	`+ coverage-html</literal> will overwrite each other's files, so mixing them`
	`719`	`+ might be confusing.)`
	`720`	`+ </para>`
	`721`	`+`
`709`	`722`	`<para>`
`710`	`723`	`To reset the execution counts between test runs, run:`
`711`	`724`	`<screen>`

`‎src/Makefile.global.in`

Lines changed: 16 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -874,33 +874,37 @@ endif # enable_nls`
`874`	`874`
`875`	`875`	`ifeq ($(enable_coverage), yes)`
`876`	`876`
`877`		`-# There is a strange interaction between lcov and existing .gcov`
`878`		`-# output files. Hence the rm command and the ordering dependency.`
	`877`	`+# make coverage -- text output`
`879`	`878`
`880`		`-gcda_files :=$(wildcard*.gcda)`
	`879`	`+local_gcda_files=$(wildcard*.gcda)`
`881`	`880`
`882`		`-lcov.info:$(gcda_files)`
`883`		`-rm -f.gcov ..gcov`
`884`		`-$(if$^,$(LCOV) -d . -c -o$@$(LCOVFLAGS) --gcov-tool$(GCOV))`
	`881`	`+coverage:$(local_gcda_files:.gcda=.c.gcov)`
`885`	`882`
`886`		`-%.c.gcov:%.gcda \| lcov.info`
	`883`	`+%.c.gcov:%.gcda`
`887`	`884`	`$(GCOV) -b -f -p -o.$(GCOVFLAGS)$.c>$.c.gcov.out`
`888`	`885`
`889`		`-coverage:$(gcda_files:.gcda=.c.gcov)lcov.info`
	`886`	`+# makecoverage-html -- HTML output vialcov`
`890`	`887`
`891`	`888`	`.PHONY: coverage-html`
`892`		`-coverage-html: coverage`
	`889`	`+coverage-html: coverage-html-stamp`
	`890`	`+`
	`891`	`+coverage-html-stamp: lcov.info`
`893`	`892`	`rm -rf coverage`
`894`		`-mkdir coverage`
`895`		-$(GENHTML) --show-details --legend --output-directory=coverage --title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir)`find. -name lcov.info -print`
	`893`	`+$(GENHTML) --show-details --legend --output-directory=coverage --title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir)$<`
	`894`	`+touch$@`
	`895`	`+`
	`896`	`+all_gcda_files =$(shell find . -name '*.gcda' -print)`
	`897`	`+`
	`898`	`+lcov.info:$(all_gcda_files)`
	`899`	`+$(LCOV) -d. -c -o$@$(LCOVFLAGS) --gcov-tool$(GCOV)`
`896`	`900`
`897`	`901`
`898`	`902`	`# hook for clean-up`
`899`	`903`	`cleandistcleanmaintainer-clean: clean-coverage`
`900`	`904`
`901`	`905`	`.PHONY: clean-coverage`
`902`	`906`	`clean-coverage:`
`903`		`-rm -rf coverage`
	`907`	`+rm -rf coverage coverage-html-stamp`
`904`	`908`	`rm -f.gcda.gcno lcov.info.gcov ..gcov*.gcov.out`
`905`	`909`
`906`	`910`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit504923a

File tree

3 files changed

3 files changed

`‎.gitignore`

`‎doc/src/sgml/regress.sgml`

`‎src/Makefile.global.in`

0 commit comments