diff options
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 3bf658d6b0c..9830b17830e 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -431,6 +431,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 30c4b573e40..2059c07eabb 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -230,7 +230,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) |