[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-259-g6d2d12c14

[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  6d2d12c1441a0a9157c0824dae11271cb0b646ec (commit)
       via  6a802d8c4fb4b9eeab71703f7d7063a5bde6629a (commit)
      from  4c3c8e37839127b67dc3f0cf08f67cddc7441d89 (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 6d2d12c1441a0a9157c0824dae11271cb0b646ec
Author: Sandro Santilli <strk at kbt.io>
Date:   Sun Jan 16 22:15:08 2022 +0100

    run_test.pl: fail immediately if upgrade of any component fails

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 5322e5e95..9810a81d7 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -1538,62 +1538,29 @@ sub upgrade_spatial
 {
     print "Upgrading PostGIS in '${DB}' \n" ;
 
-    my $script = `ls ${STAGED_SCRIPTS_DIR}/postgis_upgrade.sql`;
-    chomp($script);
-
-    if ( -e $script )
-    {
-        print "Upgrading core\n";
-        load_sql_file($script);
-    }
-    else
-    {
-        die "$script not found\n";
-    }
+    my $script = "${STAGED_SCRIPTS_DIR}/postgis_upgrade.sql";
+    print "Upgrading core\n";
+    die unless load_sql_file($script, 1);
 
     if ( $OPT_WITH_TOPO )
     {
-        my $script = `ls ${STAGED_SCRIPTS_DIR}/topology_upgrade.sql`;
-        chomp($script);
-        if ( -e $script )
-        {
-            print "Upgrading topology\n";
-            load_sql_file($script);
-        }
-        else
-        {
-            die "$script not found\n";
-        }
+        $script = "${STAGED_SCRIPTS_DIR}/topology_upgrade.sql";
+        print "Upgrading topology\n";
+        die unless load_sql_file($script, 1);
     }
 
     if ( $OPT_WITH_RASTER )
     {
-        my $script = `ls ${STAGED_SCRIPTS_DIR}/rtpostgis_upgrade.sql`;
-        chomp($script);
-        if ( -e $script )
-        {
-            print "Upgrading raster\n";
-            load_sql_file($script);
-        }
-        else
-        {
-            die "$script not found\n";
-        }
+        $script = "${STAGED_SCRIPTS_DIR}/rtpostgis_upgrade.sql";
+        print "Upgrading raster\n";
+        die unless load_sql_file($script, 1);
     }
 
     if ( $OPT_WITH_SFCGAL )
     {
-        my $script = `ls ${STAGED_SCRIPTS_DIR}/sfcgal_upgrade.sql`;
-        chomp($script);
-        if ( -e $script )
-        {
-            print "Upgrading sfcgal\n";
-            load_sql_file($script);
-        }
-        else
-        {
-            die "$script not found\n";
-        }
+        $script = "${STAGED_SCRIPTS_DIR}/sfcgal_upgrade.sql";
+        print "Upgrading sfcgal\n";
+        die unless load_sql_file($script, 1);
     }
 
     return 1;

commit 6a802d8c4fb4b9eeab71703f7d7063a5bde6629a
Author: Sandro Santilli <strk at kbt.io>
Date:   Sun Jan 16 21:52:25 2022 +0100

    Include internal RUNTESTFLAGS when testing upgrades
    
    Fixes #5054

diff --git a/regress/runtest.mk b/regress/runtest.mk
index 382c25d2a..bfad91b7e 100644
--- a/regress/runtest.mk
+++ b/regress/runtest.mk
@@ -16,6 +16,7 @@ check-regress:
 		$(PERL) $(topsrcdir)/regress/run_test.pl \
       --upgrade \
       $(RUNTESTFLAGS) \
+      $(RUNTESTFLAGS_INTERNAL) \
       $(TESTS); \
 	else \
 		echo "Skipping upgrade test as RUNTESTFLAGS already requested upgrades"; \

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

Summary of changes:
 regress/run_test.pl | 57 +++++++++++------------------------------------------
 regress/runtest.mk  |  1 +
 2 files changed, 13 insertions(+), 45 deletions(-)


hooks/post-receive
-- 
PostGIS