From: Andrew Dunstan <andrew@dunslane.net>
Date: Mon, 3 Dec 2012 20:03:15 +0000 (-0500)
Subject: Revert "Add mode where contrib installcheck runs each module in a separately named... 
X-Git-Tag: REL9_1_7~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13632b0c14cca224a03c2ed76933d0700579dd8a;p=postgresql

Revert "Add mode where contrib installcheck runs each module in a separately named database."

This reverts commit 513e546a6e75b0a79c3102ce22c583ccd1053ac6.
---

diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile
index 9674a149ee..ac637480eb 100644
--- a/contrib/dblink/Makefile
+++ b/contrib/dblink/Makefile
@@ -11,9 +11,6 @@ DATA = dblink--1.0.sql dblink--unpackaged--1.0.sql
 
 REGRESS = dblink
 
-# the db name is hard-coded in the tests
-override undefine USE_MODULE_DB
-
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 9830b17830..3bf658d6b0 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 2059c07eab..30c4b573e4 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)