diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2012-12-02 17:20:38 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2012-12-02 17:20:38 -0500 |
| commit | e2b3c21b05c78c3a726b189242e41d4aa4422bf1 (patch) | |
| tree | a3fd330c29776db24ffd98fe4c3ec7646774a674 /src | |
| parent | fc75d4f81c1b2f27d1954c4b9aac29370c00a0c8 (diff) | |
Add mode where contrib installcheck runs each module in a separately named database.
Normally each module is tested in aq database named contrib_regression,
which is dropped and recreated at the beginhning of each pg_regress run.
This 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.
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 9 | ||||
| -rw-r--r-- | src/makefiles/pgxs.mk | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index e10eeada874..9cc14dae683 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -428,6 +428,15 @@ 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 diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index fd6473fd910..78e113916ca 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -240,7 +240,11 @@ distclean maintainer-clean: clean ifdef REGRESS # Select database to use for running the tests -REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB) +ifdef USE_MODULE_DB + REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB_MODULE) +else + REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB) +endif # where to find psql for running the tests PSQLDIR = $(bindir) |