diff options
| author | Tom Lane | 2011-08-24 19:16:17 +0000 |
|---|---|---|
| committer | Tom Lane | 2011-08-24 19:16:50 +0000 |
| commit | d1d388603e4f9233d3e01847405b239972a54fdf (patch) | |
| tree | 7706216f61ffa62f2cecf5ebdb1c8a721615848c /contrib/sepgsql | |
| parent | 4803de6f8932e2f2b96bb1243ba07a05cd2c3ae5 (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 'contrib/sepgsql')
| -rw-r--r-- | contrib/sepgsql/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/sepgsql/Makefile b/contrib/sepgsql/Makefile index 1978ccf8c86..248b1dd7f40 100644 --- a/contrib/sepgsql/Makefile +++ b/contrib/sepgsql/Makefile @@ -4,8 +4,11 @@ MODULE_big = sepgsql OBJS = hooks.o selinux.o label.o dml.o \ schema.o relation.o proc.o DATA_built = sepgsql.sql + REGRESS = label dml misc REGRESS_PREP = check_selinux_environment +REGRESS_OPTS = --launcher $(top_builddir)/contrib/sepgsql/launcher + EXTRA_CLEAN = -r tmp *.pp sepgsql-regtest.if sepgsql-regtest.fc ifdef USE_PGXS @@ -20,7 +23,6 @@ include $(top_srcdir)/contrib/contrib-global.mk endif SHLIB_LINK += -lselinux -REGRESS_OPTS += --launcher $(top_builddir)/contrib/sepgsql/launcher check_selinux_environment: @$(top_builddir)/contrib/sepgsql/chkselinuxenv "$(bindir)" "$(datadir)" |