diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-08-07 20:50:22 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-08-07 20:50:22 +0000 |
| commit | 7798147a7642521055f48e1b27b7024c46c6b446 (patch) | |
| tree | 4464257703236148eee73a44244b5bc10f6b6f95 /src/backend | |
| parent | e605fbcccdf4705de4afa7e23be5b8222e1cb00d (diff) | |
| download | postgresql-7798147a7642521055f48e1b27b7024c46c6b446.tar.gz postgresql-7798147a7642521055f48e1b27b7024c46c6b446.zip | |
Expand test coverage support to entire tree
Test coverage support now covers the entire source tree, including
contrib, instead of just src/backend. In a related but independent
development, the commands make coverage and make coverage-html can be run
in any directory.
This turned out to be much easier than feared. Besides a few ad hoc fixes
to pass the make target down the tree, change all affected makefiles to
list their directories in the SUBDIRS variable, changed from variants like
DIRS and WANTED_DIRS. MSVC build fix was attempted as well.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/common.mk | 8 | ||||
| -rw-r--r-- | src/backend/utils/mb/conversion_procs/Makefile | 12 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/backend/common.mk b/src/backend/common.mk index c617c672765..f4de2fe53d5 100644 --- a/src/backend/common.mk +++ b/src/backend/common.mk @@ -1,7 +1,7 @@ # # Common make rules for backend # -# $PostgreSQL: pgsql/src/backend/common.mk,v 1.8 2008/09/05 12:11:18 petere Exp $ +# $PostgreSQL: pgsql/src/backend/common.mk,v 1.9 2009/08/07 20:50:22 petere Exp $ # # When including this file, set OBJS to the object files created in @@ -46,9 +46,3 @@ ifdef SUBDIRS for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean || exit; done endif rm -f $(subsysfilename) $(OBJS) - - -coverage: $(gcda_files:.gcda=.c.gcov) lcov.info -ifdef SUBDIRS - for dir in $(SUBDIRS); do $(MAKE) -C $$dir coverage || exit; done -endif diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile index 2d0b37564a0..17b5f715035 100644 --- a/src/backend/utils/mb/conversion_procs/Makefile +++ b/src/backend/utils/mb/conversion_procs/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mb/conversion_procs # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.21 2009/02/10 19:29:39 petere Exp $ +# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.22 2009/08/07 20:50:22 petere Exp $ # #------------------------------------------------------------------------- @@ -17,7 +17,7 @@ SQLSCRIPT = conversion_create.sql # This file can be placed as src/test/regress/conversion.sql REGRESSION_SCRIPT = conversion.sql -DIRS = \ +SUBDIRS = \ ascii_and_mic cyrillic_and_mic euc_cn_and_mic euc_jp_and_sjis \ euc_kr_and_mic euc_tw_and_big5 latin2_and_win1250 latin_and_mic \ utf8_and_ascii utf8_and_big5 utf8_and_cyrillic utf8_and_euc_cn \ @@ -162,7 +162,7 @@ CONVERSIONS = \ shift_jis_2004_to_euc_jis_2004 SHIFT_JIS_2004 EUC_JIS_2004 shift_jis_2004_to_euc_jis_2004 euc_jis_2004_and_shift_jis_2004 all: $(SQLSCRIPT) - @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done + @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done $(SQLSCRIPT): Makefile ifeq ($(enable_shared), yes) @@ -205,16 +205,16 @@ $(REGRESSION_SCRIPT): Makefile install: $(SQLSCRIPT) installdirs $(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)' - @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done + @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done installdirs: $(mkinstalldirs) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(pkglibdir)' uninstall: rm -f '$(DESTDIR)$(datadir)/$(SQLSCRIPT)' - @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done + @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done clean distclean maintainer-clean: rm -f $(SQLSCRIPT) - @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done + @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done |