From: Sandro Santilli <strk@kbt.io>
Date: Thu, 22 Aug 2019 09:20:50 +0000 (+0000)
Subject: Have 'installcheck' also check with upgrade-from-function
X-Git-Tag: 3.0.0beta1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8334f748925d0031e9b960b942b6bc2d0f5ed435;p=postgis

Have 'installcheck' also check with upgrade-from-function

Closes #4485

Adds an installcheck-upgrade-byfunc target,
dependency of installcheck-upgrade

git-svn-id: http://svn.osgeo.org/postgis/trunk@17753 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 65265b9e6..a107124a2 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -56,13 +56,21 @@ installcheck-base:
 	RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check
 
 # only run upgrade test if RUNTESTFLAGS was not already doing that
-installcheck-upgrade:
+installcheck-upgrade: installcheck-upgrade-byfunc
 	if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
 		RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
 			--upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)" \
 			$(MAKE) check; \
 	fi
 
+# only run upgrade test if RUNTESTFLAGS was not already doing that
+installcheck-upgrade-byfunc:
+	if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
+		RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
+			--upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)!" \
+			$(MAKE) check; \
+	fi
+
 distclean: distclean-local
 
 distclean-local: clean-local