Commit61b7969

Karina Litskevich

authored and

Ekaterina Sokolova

committed

[PGPRO-13969] Fix a problem with isolation tests in v12 and v13 when using pgxs

Before commit 2203ede9 in PG14 running isolation test using PGXS was notworking - an error occurred. This is a hack to avoid the error.Tags: rum

1 parent065accd commit61b7969Copy full SHA for 61b7969

File tree

1 file changed

+19

-10

lines changed

Makefile

1 file changed

+19

-10

lines changed

`‎Makefile‎`

Lines changed: 19 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,6 @@ ISOLATION_OPTS = --load-extension=rum`
`35`	`35`	`EXTRA_CLEAN = pglist_tmp`
`36`	`36`
`37`	`37`	`ifdefUSE_PGXS`
`38`		`-`
`39`		`-# We cannot run isolation test for versions 12,13 in PGXS case`
`40`		`-# because 'pg_isolation_regress' is not copied to install`
`41`		`-# directory, see src/test/isolation/Makefile`
`42`		`-ifeq ($(MAJORVERSION),$(filter 12% 13%,$(MAJORVERSION)))`
`43`		`-undefineISOLATION`
`44`		`-undefineISOLATION_OPTS`
`45`		`-endif`
`46`		`-`
`47`	`38`	`PG_CONFIG = pg_config`
`48`	`39`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`49`	`40`	`include$(PGXS)`
`@@ -57,6 +48,24 @@ endif`
`57`	`48`	`$(EXTENSION)--$(EXTVERSION).sql: rum_init.sql`
`58`	`49`	`cat$^>$@`
`59`	`50`
	`51`	`+#`
	`52`	`+# On versions 12 and 13 isolation tests cannot be run using pgxs.`
	`53`	`+# Override installcheck target to avoid the error. This is just a`
	`54`	`+# shortcut version of installcheck target from pgxs.mk that runs`
	`55`	`+# all other tests besides isolation tests.`
	`56`	`+#`
	`57`	`+ifdefUSE_PGXS`
	`58`	`+ifeq ($(MAJORVERSION),$(filter 12% 13%,$(MAJORVERSION)))`
	`59`	`+installcheck: submake$(REGRESS_PREP)`
	`60`	`+ifdefREGRESS`
	`61`	`+$(pg_regress_installcheck) $(REGRESS_OPTS) $(REGRESS)`
	`62`	`+endif`
	`63`	`+ifdefTAP_TESTS`
	`64`	`+$(prove_installcheck)`
	`65`	`+endif`
	`66`	`+endif`
	`67`	`+endif`
	`68`	`+`
`60`	`69`	`ifeq ($(MAJORVERSION), 9.6)`
`61`	`70`	`# arrays are not supported on 9.6`
`62`	`71`	`else`
`@@ -99,4 +108,4 @@ isolationcheck: \| submake-isolation submake-rum temp-install`
`99`	`108`	`$(pg_isolation_regress_check)\`
`100`	`109`	`--temp-config$(top_srcdir)/contrib/rum/logical.conf\`
`101`	`110`	`$(ISOLATIONCHECKS)`
`102`		`-endif`
	`111`	`+endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit61b7969

File tree

1 file changed

1 file changed

`‎Makefile‎`

0 commit comments