diff --git a/Makefile b/Makefile
index a8d510019d..b8cd3bcbde 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)
@@ -99,4 +90,22 @@ 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
+
+#
+# On versions 12 and 13 isolation tests cannot be run using pgxs.
+# Override installcheck target to avoid the error. This is just a stripped down
+# 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
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