diff options
| -rw-r--r-- | src/Makefile.global.in | 21 | ||||
| -rw-r--r-- | src/makefiles/pgxs.mk | 7 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index ff47d5c4e7b..b4a2f9c8795 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -512,16 +512,21 @@ submake-libpgport: # # Testing support -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) +ifneq ($(USE_MODULE_DB),) + PL_TESTDB = pl_regression_$(NAME) + # Replace this with $(or ...) if we ever require GNU make 3.81. + ifneq ($(MODULE_big),) + CONTRIB_TESTDB=contrib_regression_$(MODULE_big) else - CONTRIB_TESTDB_MODULE = contrib_regression + ifneq ($(MODULES),) + CONTRIB_TESTDB=contrib_regression_$(word 1,$(MODULES)) + else + CONTRIB_TESTDB=contrib_regression_$(word 1,$(REGRESS)) + endif endif +else + PL_TESTDB = pl_regression + CONTRIB_TESTDB = contrib_regression endif ifdef NO_LOCALE diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index faa7dd9b987..424741f9d5c 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -256,12 +256,7 @@ distclean maintainer-clean: clean ifdef REGRESS -# Select database to use for running the tests -ifneq ($(USE_MODULE_DB),) - REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB_MODULE) -else - REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB) -endif +REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB) # where to find psql for running the tests PSQLDIR = $(bindir) |