diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-09-27 17:43:31 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-09-27 17:43:31 +0000 |
commit | 1610fcc351b11defadfe76d3294f8fb761f64d78 (patch) | |
tree | 4ac0ada84dcc2d18890c783e20717b08d526a77c /src | |
parent | 4fc935a5d47d40aac5b1ecf51aa5beaab03e8f76 (diff) |
Some marginal tweaks to make 'make installcheck' mostly work when
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/makefiles/pgxs.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index b12deb7d589..b18b4589c8d 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -1,6 +1,6 @@ # 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 # extension modules. You only need to set a few variables and include @@ -205,6 +205,11 @@ distclean maintainer-clean: clean 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 # 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 @@ -224,7 +229,9 @@ endif # VPATH .PHONY: submake submake: +ifndef PGXS $(MAKE) -C $(top_builddir)/src/test/regress pg_regress +endif # against installed postmaster installcheck: submake |