diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-08-24 15:16:23 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-08-24 15:17:03 -0400 |
| commit | 5354abb8f69734ff1c07cee5e29845b74d46e9d6 (patch) | |
| tree | 41ce669b9550d8668a78f72d7bd2dac0cd2bf64f /src | |
| parent | ed1a4adbe38ed94cc2e3c017a9f5be4b282bccb9 (diff) | |
Fix pgxs.mk to always add --dbname=$(CONTRIB_TESTDB) to REGRESS_OPTS.
The previous coding resulted in contrib modules unintentionally overriding
the use of CONTRIB_TESTDB. There seems no particularly good reason to
allow that (after all, the makefile can set CONTRIB_TESTDB if that's really
what it intends).
In passing, document REGRESS_OPTS where the other pgxs.mk options are
documented.
Back-patch to 9.1 --- in prior versions, there were no cases of contrib
modules setting REGRESS_OPTS without including the --dbname switch, so
while the coding was fragile there was no actual bug.
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefiles/pgxs.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 05ed8416a9f..8b089e7a761 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -38,6 +38,7 @@ # SCRIPTS_built -- script files (not binaries) to install into $PREFIX/bin, # which need to be built first # REGRESS -- list of regression test cases (without suffix) +# REGRESS_OPTS -- additional switches to pass to pg_regress # EXTRA_CLEAN -- extra files to remove in 'make clean' # PG_CPPFLAGS -- will be added to CPPFLAGS # PG_LIBS -- will be added to PROGRAM link line @@ -225,10 +226,8 @@ 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 +# Select database to use for running the tests +REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB) # where to find psql for running the tests PSQLDIR = $(bindir) |