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

Karina Litskevich · Ekaterina Sokolova · commit 61b79690c705 · 2025-06-23T18:02:37.000+03:00
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
diff --git 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
+endif
