From 61b79690c705e4f1198679d52511ab200acdabd0 Mon Sep 17 00:00:00 2001 From: Karina Litskevich Date: Fri, 20 Jun 2025 16:30:19 +0300 Subject: [PATCH 1/2] [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 not working - an error occurred. This is a hack to avoid the error. Tags: rum --- Makefile | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index a8d510019d..23a376f313 100644 --- a/Makefile +++ b/Makefile @@ -35,15 +35,6 @@ ISOLATION_OPTS = --load-extension=rum EXTRA_CLEAN = pglist_tmp ifdef USE_PGXS - -# We cannot run isolation test for versions 12,13 in PGXS case -# because 'pg_isolation_regress' is not copied to install -# directory, see src/test/isolation/Makefile -ifeq ($(MAJORVERSION),$(filter 12% 13%,$(MAJORVERSION))) -undefine ISOLATION -undefine ISOLATION_OPTS -endif - PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) @@ -57,6 +48,24 @@ endif $(EXTENSION)--$(EXTVERSION).sql: rum_init.sql cat $^ > $@ +# +# On versions 12 and 13 isolation tests cannot be run using pgxs. +# Override installcheck target to avoid the error. This is just a +# shortcut version of installcheck target from pgxs.mk that runs +# all other tests besides isolation tests. +# +ifdef USE_PGXS +ifeq ($(MAJORVERSION), $(filter 12% 13%, $(MAJORVERSION))) +installcheck: submake $(REGRESS_PREP) +ifdef REGRESS + $(pg_regress_installcheck) $(REGRESS_OPTS) $(REGRESS) +endif +ifdef TAP_TESTS + $(prove_installcheck) +endif +endif +endif + ifeq ($(MAJORVERSION), 9.6) # arrays are not supported on 9.6 else @@ -99,4 +108,4 @@ isolationcheck: | submake-isolation submake-rum temp-install $(pg_isolation_regress_check) \ --temp-config $(top_srcdir)/contrib/rum/logical.conf \ $(ISOLATIONCHECKS) -endif \ No newline at end of file +endif From a16ce5f23981f5d40ce52851e08ddb3fad69b2c4 Mon Sep 17 00:00:00 2001 From: Ekaterina Sokolova Date: Mon, 23 Jun 2025 14:26:58 +0300 Subject: [PATCH 2/2] Beautify Makefile in terms of supporting old versions --- Makefile | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 23a376f313..eda60baa31 100644 --- a/Makefile +++ b/Makefile @@ -21,12 +21,12 @@ RELATIVE_INCLUDES = $(addprefix src/, $(INCLUDES)) LDFLAGS_SL += $(filter -lm, $(LIBS)) -REGRESS = security rum rum_validate rum_hash ruminv timestamp orderby orderby_hash \ - altorder altorder_hash limits \ +REGRESS = security rum rum_validate rum_hash ruminv timestamp \ + orderby orderby_hash altorder altorder_hash limits \ int2 int4 int8 float4 float8 money oid \ time timetz date interval \ macaddr inet cidr text varchar char bytea bit varbit \ - numeric rum_weight expr + numeric rum_weight expr array TAP_TESTS = 1 @@ -66,25 +66,17 @@ endif endif endif -ifeq ($(MAJORVERSION), 9.6) -# arrays are not supported on 9.6 -else -REGRESS += array -endif - -# For 9.6-11 we have to make specific target with tap tests +# -------------------------------------------------------- +# Make conditional targets to save backward compatibility +# with PG11, PG10 and PG9.6. +# -------------------------------------------------------- ifeq ($(MAJORVERSION), $(filter 9.6% 10% 11%, $(MAJORVERSION))) -wal-check: temp-install - $(prove_check) -check: wal-check +# arrays are not supported on 9.6 +ifeq ($(MAJORVERSION), 9.6) +REGRESS := $(filter-out array, $(REGRESS)) endif -# -# Make conditional targets to save backward compatibility with PG11, PG10 and PG9.6. -# -ifeq ($(MAJORVERSION), $(filter 9.6% 10% 11%, $(MAJORVERSION))) - install: installincludes installincludes: @@ -108,4 +100,9 @@ isolationcheck: | submake-isolation submake-rum temp-install $(pg_isolation_regress_check) \ --temp-config $(top_srcdir)/contrib/rum/logical.conf \ $(ISOLATIONCHECKS) + +# For 9.6-11 we have to make specific target with tap tests +check: temp-install + $(prove_check) + endif pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy