mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-24 18:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit c8f666abde.
This commit is contained in:
Andrew Dunstan 2012-12-03 15:03:50 -05:00
parent c52e0e2afc
commit 6555920228
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/dblink/Makefile
View File

@ -10,9 +10,6 @@ DATA = uninstall_dblink.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

@ -284,15 +284,6 @@ BZIP2 = bzip2
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
# Installation. # Installation.

6
src/makefiles/pgxs.mk
View File

@ -233,11 +233,7 @@ ifdef REGRESS
# Calling makefile can set REGRESS_OPTS, but this is the default: # Calling makefile can set REGRESS_OPTS, but this is the default:
ifndef REGRESS_OPTS ifndef REGRESS_OPTS
ifdef USE_MODULE_DB REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB_MODULE)
else
REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
endif
endif endif
# where to find psql for running the tests # where to find psql for running the tests