[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-260-g9b186c4d3
git at osgeo.org
git at osgeo.org
Sun Jan 16 13:49:20 PST 2022
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 9b186c4d3d23029f7164c54c9c6add440987cf3b (commit)
from 6d2d12c1441a0a9157c0824dae11271cb0b646ec (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 9b186c4d3d23029f7164c54c9c6add440987cf3b
Author: Sandro Santilli <strk at kbt.io>
Date: Sun Jan 16 22:48:57 2022 +0100
run_test.pl: include upgrade errors when in verbose mode
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 9810a81d7..a286540bb 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -309,22 +309,24 @@ if ( $OPT_UPGRADE )
foreach my $hook (@OPT_HOOK_BEFORE_UPGRADE)
{
print "Running before-upgrade-script $hook\n";
- die unless load_sql_file($hook, 1);
+ fail("before-upgrade-script $hook", $REGRESS_LOG)
+ unless load_sql_file($hook, 1);
}
- if ( $OPT_EXTENSIONS )
- {
- upgrade_spatial_extensions();
- }
- else
- {
- upgrade_spatial();
- }
+ if ( $OPT_EXTENSIONS )
+ {
+ upgrade_spatial_extensions();
+ }
+ else
+ {
+ upgrade_spatial();
+ }
foreach my $hook (@OPT_HOOK_AFTER_UPGRADE)
{
print "Running after-upgrade-script $hook\n";
- die unless load_sql_file($hook, 1);
+ fail("after-upgrade-script $hook", $REGRESS_LOG)
+ unless load_sql_file($hook, 1);
}
# Update libver
@@ -1540,27 +1542,31 @@ sub upgrade_spatial
my $script = "${STAGED_SCRIPTS_DIR}/postgis_upgrade.sql";
print "Upgrading core\n";
- die unless load_sql_file($script, 1);
+ fail('core upgrading', $REGRESS_LOG)
+ unless load_sql_file($script, 1);
if ( $OPT_WITH_TOPO )
{
$script = "${STAGED_SCRIPTS_DIR}/topology_upgrade.sql";
print "Upgrading topology\n";
- die unless load_sql_file($script, 1);
+ fail('topology upgrade', $REGRESS_LOG)
+ unless load_sql_file($script, 1);
}
if ( $OPT_WITH_RASTER )
{
$script = "${STAGED_SCRIPTS_DIR}/rtpostgis_upgrade.sql";
print "Upgrading raster\n";
- die unless load_sql_file($script, 1);
+ fail('raster upgrade', $REGRESS_LOG)
+ unless load_sql_file($script, 1);
}
if ( $OPT_WITH_SFCGAL )
{
$script = "${STAGED_SCRIPTS_DIR}/sfcgal_upgrade.sql";
print "Upgrading sfcgal\n";
- die unless load_sql_file($script, 1);
+ fail('sfcgal upgrade', $REGRESS_LOG)
+ unless load_sql_file($script, 1);
}
return 1;
-----------------------------------------------------------------------
Summary of changes:
regress/run_test.pl | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list