Commit6555920

committed

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

This reverts commitc8f666a.

1 parentc52e0e2 commit6555920Copy full SHA for 6555920

File tree

-17

lines changed

-17

lines changed

Lines changed: 0 additions & 3 deletions

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

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -284,15 +284,6 @@ BZIP2= bzip2`
`284`	`284`
`285`	`285`	`PL_TESTDB = pl_regression`
`286`	`286`	`CONTRIB_TESTDB = contrib_regression`
`287`		`-ifneq ($(MODULE_big),)`
`288`		`-CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULE_big)`
`289`		`-else`
`290`		`- ifneq ($(MODULES),)`
`291`		`-CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULES)`
`292`		`- else`
`293`		`-CONTRIB_TESTDB_MODULE = contrib_regression`
`294`		`- endif`
`295`		`-endif`
`296`	`287`
`297`	`288`	`# Installation.`
`298`	`289`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -233,11 +233,7 @@ ifdef REGRESS`
`233`	`233`
`234`	`234`	`# Calling makefile can set REGRESS_OPTS, but this is the default:`
`235`	`235`	`ifndefREGRESS_OPTS`
`236`		`- ifdef USE_MODULE_DB`
`237`		`-REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB_MODULE)`
`238`		`- else`
`239`		`-REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)`
`240`		`- endif`
	`236`	`+REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)`
`241`	`237`	`endif`
`242`	`238`
`243`	`239`	`# where to find psql for running the tests`

Comments

(0)