mirror of
https://github.com/postgres/postgres.git
synced 2025-07-18 17:42:25 +03:00
Add mode where contrib installcheck runs each module in a separately named database.
Normally each module is tested in a database named contrib_regression, which is dropped and recreated at the beginhning of each pg_regress run. This new mode, enabled by adding USE_MODULE_DB=1 to the make command line, runs most modules in a database with the module name embedded in it. This will make testing pg_upgrade on clusters with the contrib modules a lot easier. Second attempt at this, this time accomodating make versions older than 3.82. Still to be done: adapt to the MSVC build system. Backpatch to 9.0, which is the earliest version it is reasonably possible to test upgrading from.
This commit is contained in:
@ -10,6 +10,9 @@ DATA = uninstall_dblink.sql
|
|||||||
REGRESS = dblink
|
REGRESS = dblink
|
||||||
|
|
||||||
|
|
||||||
|
# the db name is hard-coded in the tests
|
||||||
|
override 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)
|
||||||
|
@ -284,6 +284,15 @@ 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.
|
||||||
|
|
||||||
|
@ -233,7 +233,11 @@ 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
|
||||||
REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
|
ifneq ($(USE_MODULE_DB),)
|
||||||
|
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
|
||||||
|
Reference in New Issue
Block a user