diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2012-12-03 15:02:32 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2012-12-03 15:02:32 -0500 |
| commit | 7f7b49c47acf5194a424c046bb72c8b99f600023 (patch) | |
| tree | d437adf4e742a156af69610ae9f68916c791f405 /src | |
| parent | 17ee02ea1c87b96a4d687d3319f6f4602450d6cb (diff) | |
| download | postgresql-7f7b49c47acf5194a424c046bb72c8b99f600023.tar.gz postgresql-7f7b49c47acf5194a424c046bb72c8b99f600023.zip | |
Revert "Add mode where contrib installcheck runs each module in a separately named database."
This reverts commit 30248be9635e844918c2873ae7bb598f8a487e49.
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 b10ce307163..e10c86cd311 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 78e113916ca..fd6473fd910 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -240,11 +240,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) |