[SCM] PostGIS branch master updated. 3.4.0rc1-1118-g2df90f2a4

[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  2df90f2a4f450c21183edd830b89bbe29926472e (commit)
      from  1cfeb88f9a4786ded15db1f4ede6821f3184316e (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 2df90f2a4f450c21183edd830b89bbe29926472e
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon May 20 19:27:15 2024 +0200

    Show last lines of garden logs on failure, pre-drop the gardendb
    
    References #5636

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 070f1388a..8f5472c1b 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -100,16 +100,24 @@ staged-install:
 	$(PERL) -pi -e 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' $(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql
 
 garden: staged-install
+	dropdb --if-exists $(GARDENDB)
 	createdb $(GARDENDB)
 	psql -qX -v ON_ERROR_STOP=true -d $(GARDENDB) < $(REGRESS_INSTALLDIR)/share/contrib/postgis/postgis.sql
 	psql -qX -v ON_ERROR_STOP=true -d $(GARDENDB) < $(REGRESS_INSTALLDIR)/share/contrib/postgis/spatial_ref_sys.sql
 	psql -qX -v ON_ERROR_STOP=true -d $(GARDENDB) < $(REGRESS_INSTALLDIR)/share/contrib/postgis/rtpostgis.sql
 	@echo '-------------------------------------------------'
-	@echo 'Regression tests in progress (it will take time)'
-	@echo 'Result output: ./regress/postgis_garden_result.txt'
+	@echo 'PostGIS garden tests in progress (it will take time)'
 	@echo '-------------------------------------------------'
-	psql -X -ad $(GARDENDB) < ../doc/postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > postgis_garden_result.txt 2>&1
+	psql -X -ad $(GARDENDB) < \
+		../doc/postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql \
+		> postgis_garden_result.txt 2>&1 || { \
+		tail postgis_garden_result.txt; false; }
 	tail postgis_garden_result.txt
-	psql -X -ad $(GARDENDB) < ../doc/raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > raster_garden_result.txt 2>&1
+	@echo '-------------------------------------------------'
+	@echo 'PostGIS Raster garden tests in progress (it will take time)'
+	@echo '-------------------------------------------------'
+	psql -X -ad $(GARDENDB) < \
+		../doc/raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql \
+		> raster_garden_result.txt 2>&1 || { \
+		tail raster_garden_result.txt; false; }
 	tail raster_garden_result.txt
-	#dropdb $(GARDENDB)

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

Summary of changes:
 regress/Makefile.in | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS