[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-167-g44d725332

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  44d72533269d4729b4f2e2474ed4e503b5ddce4b (commit)
      from  f72f7e431c195a71f262db0f728e4c21a4295aec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 44d72533269d4729b4f2e2474ed4e503b5ddce4b
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 5 00:10:16 2022 +0200

    Enhance make installcheck to include self-self by-function upgrade
    
    Drop hard-coded by-function upgrade test from check_all_upgrades.sh
    landed with 34ddeb15fc9b9c357b801f3773db787fa4a1e099
    
    Closes #5256

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 50c2313ac..9d29597af 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -14,6 +14,7 @@ HAVE_SFCGAL=@HAVE_SFCGAL@
 POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
 POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
 POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
+POSTGIS_FULL_VERSION=$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)
 
 PERL = @PERL@
 top_srcdir = @top_srcdir@
@@ -68,23 +69,36 @@ check-no-trailing-blanks:
 installcheck: installcheck-base installcheck-upgrade
 
 installcheck-base:
+	# this includes packaged-extension self upgrade
 	$(MAKE) check-regress RUNTESTFLAGS="$(RUNTESTFLAGS) --extension"
 
-# only run upgrade test if RUNTESTFLAGS was not already doing that
-installcheck-upgrade: installcheck-upgrade-byfunc
-	if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
-		$(MAKE) check-regress \
-			RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
-			--upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)"; \
-	fi
+installcheck-upgrade-base:
+	$(MAKE) installcheck-base \
+			RUNTESTFLAGS="$(RUNTESTFLAGS) \
+			--upgrade"
+
+installcheck-upgrade:
+	$(MAKE) installcheck-upgrade-from-unpackaged
+	$(MAKE) installcheck-upgrade-from-unpackaged-by-func
+	$(MAKE) installcheck-upgrade-from-packaged-by-func
+
+
+installcheck-upgrade-from-unpackaged:
+	$(MAKE) installcheck-upgrade-base \
+			RUNTESTFLAGS="$(RUNTESTFLAGS) \
+			--upgrade-path unpackaged--$(POSTGIS_FULL_VERSION)"
+
+installcheck-upgrade-from-unpackaged-by-func:
+	$(MAKE) installcheck-upgrade-base \
+			RUNTESTFLAGS="$(RUNTESTFLAGS) \
+			--upgrade-path unpackaged--$(POSTGIS_FULL_VERSION)!"
+
+installcheck-upgrade-from-packaged-by-func:
+	$(MAKE) installcheck-upgrade-base \
+			RUNTESTFLAGS="$(RUNTESTFLAGS) \
+			--upgrade-path $(POSTGIS_FULL_VERSION)--$(POSTGIS_FULL_VERSION)!"
+
 
-# 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-regress; \
-	fi
 
 distclean: distclean-local
 
diff --git a/utils/check_all_upgrades.sh b/utils/check_all_upgrades.sh
index 458822d8f..bfcec355d 100755
--- a/utils/check_all_upgrades.sh
+++ b/utils/check_all_upgrades.sh
@@ -226,20 +226,8 @@ for EXT in ${INSTALLED_EXTENSIONS}; do
     }
   done
 
-  CURRENTVERSION=`grep '^POSTGIS_' ${SRCDIR}/Version.config | cut -d= -f2 | paste -sd '.'`
-  # Test current version to current version extension upgrade
-  UPGRADE_PATH="${CURRENTVERSION}--:auto!"
-  test_label="${EXT} extension-based upgrade ${UPGRADE_PATH}"
-  echo "Testing ${test_label}"
-  RUNTESTFLAGS="--extension -v --upgrade-path=${UPGRADE_PATH} ${USERTESTFLAGS}" \
-  make -C ${REGDIR} check && {
-    echo "PASS: ${test_label}"
-  } || {
-    echo "FAIL: ${test_label}"
-    failed
-  }
-
   # Check unpackaged->unpackaged upgrades
+  CURRENTVERSION=`grep '^POSTGIS_' ${SRCDIR}/Version.config | cut -d= -f2 | paste -sd '.'`
   if test "${to_version}" = "${CURRENTVERSION}"; then
     for majmin in `'ls' -d ${CTBDIR}/postgis-* | sed 's/.*postgis-//'`
     do #{

-----------------------------------------------------------------------

Summary of changes:
 GNUmakefile.in              | 42 ++++++++++++++++++++++++++++--------------
 utils/check_all_upgrades.sh | 14 +-------------
 2 files changed, 29 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
PostGIS