Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4d29e8c

Browse files
committed
Add mode where contrib installcheck runs each module in a separately named database.
Normally each module is tested in a database named contrib_regression,which is dropped and recreated at the beginhning of each pg_regress run.This new mode, enabled by adding USE_MODULE_DB=1 to the make commandline, runs most modules in a database with the module name embedded init.This will make testing pg_upgrade on clusters with the contrib modulesa lot easier.Second attempt at this, this time accomodating make versions olderthan 3.82.Still to be done: adapt to the MSVC build system.Backpatch to 9.0, which is the earliest version it is reasonablypossible to test upgrading from.
1 parent35fb143 commit4d29e8c

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

‎contrib/dblink/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ DATA = dblink--1.0.sql dblink--unpackaged--1.0.sql
1111

1212
REGRESS = dblink
1313

14+
# the db name is hard-coded in the tests
15+
overrideUSE_MODULE_DB =
16+
1417
ifdefUSE_PGXS
1518
PG_CONFIG = pg_config
1619
PGXS :=$(shell$(PG_CONFIG) --pgxs)

‎src/Makefile.global.in‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,15 @@ submake-libpgport:
431431

432432
PL_TESTDB = pl_regression
433433
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
434443

435444
ifdefNO_LOCALE
436445
NOLOCALE += --no-locale

‎src/makefiles/pgxs.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,11 @@ distclean maintainer-clean: clean
240240
ifdefREGRESS
241241

242242
# Select database to use for running the tests
243-
REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB)
243+
ifneq ($(USE_MODULE_DB),)
244+
REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB_MODULE)
245+
else
246+
REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB)
247+
endif
244248

245249
# where to find psql for running the tests
246250
PSQLDIR =$(bindir)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp