[postgis-tickets] r17753 - Have 'installcheck' also check with upgrade-from-function

[Sandro Santilli]

Author: strk
Date: 2019-08-22 02:20:50 -0700 (Thu, 22 Aug 2019)
New Revision: 17753

Modified:
   trunk/GNUmakefile.in
Log:
Have 'installcheck' also check with upgrade-from-function

Closes #4485

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

Modified: trunk/GNUmakefile.in
===================================================================
--- trunk/GNUmakefile.in	2019-08-22 09:20:42 UTC (rev 17752)
+++ trunk/GNUmakefile.in	2019-08-22 09:20:50 UTC (rev 17753)
@@ -56,7 +56,7 @@
 	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)" \
@@ -63,6 +63,14 @@
 			$(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