mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-01-24 18:55:04 +08:00
Revert "Add mode where contrib installcheck runs each module in a separately named database."
This reverts commit c8f666abde
.
This commit is contained in:
parent
c52e0e2afc
commit
6555920228
@ -10,9 +10,6 @@ DATA = uninstall_dblink.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)
|
||||
|
@ -284,15 +284,6 @@ BZIP2 = bzip2
|
||||
|
||||
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
|
||||
|
||||
# Installation.
|
||||
|
||||
|
@ -233,11 +233,7 @@ ifdef REGRESS
|
||||
|
||||
# Calling makefile can set REGRESS_OPTS, but this is the default:
|
||||
ifndef REGRESS_OPTS
|
||||
ifdef USE_MODULE_DB
|
||||
REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB_MODULE)
|
||||
else
|
||||
REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
|
||||
endif
|
||||
REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
|
||||
endif
|
||||
|
||||
# where to find psql for running the tests
|
||||
|
Loading…
Reference in New Issue
Block a user