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, 1 insertions, 14 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 9830b17830e..3bf658d6b0c 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -431,15 +431,6 @@ 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 2059c07eabb..30c4b573e40 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -230,11 +230,7 @@ distclean maintainer-clean: clean ifdef REGRESS # Select database to use for running the tests -ifdef 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) |