Revert "Add mode where contrib installcheck runs each module in a separately named database."

This reverts commit 513e546a6e75b0a79c3102ce22c583ccd1053ac6.
This commit is contained in:
Andrew Dunstan 2012-12-03 15:03:15 -05:00
parent 3c4eec4488
commit 13632b0c14
3 changed files with 1 additions and 17 deletions

View File

@ -11,9 +11,6 @@ DATA = dblink--1.0.sql dblink--unpackaged--1.0.sql
REGRESS = dblink
# the db name is hard-coded in the tests
override undefine USE_MODULE_DB
ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)

View File

@ -431,15 +431,6 @@ submake-libpgport:
PL_TESTDB = pl_regression
CONTRIB_TESTDB = contrib_regression
ifneq ($(MODULE_big),)
CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULE_big)
else
ifneq ($(MODULES),)
CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULES)
else
CONTRIB_TESTDB_MODULE = contrib_regression
endif
endif
ifdef NO_LOCALE
NOLOCALE += --no-locale

View File

@ -230,11 +230,7 @@ distclean maintainer-clean: clean
ifdef REGRESS
# Select database to use for running the tests
ifdef USE_MODULE_DB
REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB_MODULE)
else
REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB)
endif
REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB)
# where to find psql for running the tests
PSQLDIR = $(bindir)