database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

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

Browse Source 
This reverts commit e2b3c21b05.
This commit is contained in:
Andrew Dunstan
2012-12-03 15:00:51 -05:00
parent 62656617db
commit fc5c1bbbeb
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/dblink/Makefile
View File

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

9
src/Makefile.global.in
View File

@@ -428,15 +428,6 @@ submake-libpgport:
PL_TESTDB = pl_regression PL_TESTDB = pl_regression
CONTRIB_TESTDB = contrib_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 ifdef NO_LOCALE
NOLOCALE += --no-locale NOLOCALE += --no-locale

4
src/makefiles/pgxs.mk
View File

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