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

Some marginal tweaks to make 'make installcheck' mostly work when

Browse Source 
building contrib with USE_PGXS.  To make it work all the way, the
pg_regress script would need to be included in the installation tree.
This commit is contained in:
Tom Lane 2005-09-27 17:43:31 +00:00
parent 4fc935a5d4
commit 1610fcc351
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/contrib-global.mk
View File

@ -1,5 +1,4 @@
# $PostgreSQL: pgsql/contrib/contrib-global.mk,v 1.9 2005/05/17 18:26:22 tgl Exp $ # $PostgreSQL: pgsql/contrib/contrib-global.mk,v 1.10 2005/09/27 17:43:31 tgl Exp $
NO_PGXS = 1 NO_PGXS = 1
REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
include $(top_srcdir)/src/makefiles/pgxs.mk include $(top_srcdir)/src/makefiles/pgxs.mk

9
src/makefiles/pgxs.mk
View File

@ -1,6 +1,6 @@
# PGXS: PostgreSQL extensions makefile # PGXS: PostgreSQL extensions makefile
# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.5 2005/08/12 21:02:25 momjian Exp $ # $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.6 2005/09/27 17:43:31 tgl Exp $
# This file contains generic rules to build many kinds of simple # This file contains generic rules to build many kinds of simple
# extension modules. You only need to set a few variables and include # extension modules. You only need to set a few variables and include
@ -205,6 +205,11 @@ distclean maintainer-clean: clean
ifdef REGRESS ifdef REGRESS
# Calling makefile can set REGRESS_OPTS, but this is the default:
ifndef REGRESS_OPTS
REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
endif
# When doing a VPATH build, must copy over the test .sql and .out # When doing a VPATH build, must copy over the test .sql and .out
# files so that the driver script can find them. We have to use an # files so that the driver script can find them. We have to use an
# absolute path for the targets, because otherwise make will try to # absolute path for the targets, because otherwise make will try to
@ -224,7 +229,9 @@ endif # VPATH
.PHONY: submake .PHONY: submake
submake: submake:
ifndef PGXS
$(MAKE) -C $(top_builddir)/src/test/regress pg_regress $(MAKE) -C $(top_builddir)/src/test/regress pg_regress
endif
# against installed postmaster # against installed postmaster
installcheck: submake installcheck: submake