Commit7f7b49c

committed

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

This reverts commit30248be.

1 parent17ee02e commit7f7b49cCopy full SHA for 7f7b49c

File tree

-17

lines changed

-17

lines changed

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,6 @@ DATA = dblink--1.0.sql dblink--unpackaged--1.0.sql`
`11`	`11`
`12`	`12`	`REGRESS = dblink`
`13`	`13`
`14`		`-# the db name is hard-coded in the tests`
`15`		`-override undefine USE_MODULE_DB`
`16`		`-`
`17`	`14`	`ifdefUSE_PGXS`
`18`	`15`	`PG_CONFIG = pg_config`
`19`	`16`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -431,15 +431,6 @@ submake-libpgport:`
`431`	`431`
`432`	`432`	`PL_TESTDB = pl_regression`
`433`	`433`	`CONTRIB_TESTDB = contrib_regression`
`434`		`-ifneq ($(MODULE_big),)`
`435`		`-CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULE_big)`
`436`		`-else`
`437`		`- ifneq ($(MODULES),)`
`438`		`-CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULES)`
`439`		`- else`
`440`		`-CONTRIB_TESTDB_MODULE = contrib_regression`
`441`		`- endif`
`442`		`-endif`
`443`	`434`
`444`	`435`	`ifdefNO_LOCALE`
`445`	`436`	`NOLOCALE += --no-locale`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -240,11 +240,7 @@ distclean maintainer-clean: clean`
`240`	`240`	`ifdefREGRESS`
`241`	`241`
`242`	`242`	`# Select database to use for running the tests`
`243`		`-ifdefUSE_MODULE_DB`
`244`		`-REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB_MODULE)`
`245`		`-else`
`246`		`-REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB)`
`247`		`-endif`
	`243`	`+REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB)`
`248`	`244`
`249`	`245`	`# where to find psql for running the tests`
`250`	`246`	`PSQLDIR =$(bindir)`

Comments

(0)