[postgis-tickets] [SCM] PostGIS branch main updated. 3.2.0alpha1-37-g016b911

[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, main has been updated
       via  016b9115eb87b3d3b46e009d8e78aa873a829890 (commit)
      from  f1f145c6c1030a4f66daeb127b378930d9f8dfee (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 016b9115eb87b3d3b46e009d8e78aa873a829890
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Sep 28 12:05:16 2021 +0200

    run_test.pl: avoid loader test failure breaking subsequent tests
    
    Closes #4995
    
    Still keeps the loadedshp table on failure if --nodrop is given

diff --git a/regress/run_test.pl b/regress/run_test.pl
index d7282df..a7372b2 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -1053,6 +1053,7 @@ sub run_loader_test
 	# If we have some expected files to compare with, run in wkt mode.
 	if ( ! run_loader_and_check_output("wkt test", $tblname, "${TEST}-w.sql.expected", "${TEST}-w.select.expected", "-w $custom_opts") )
 	{
+		drop_table($tblname) unless $OPT_NODROP;
 		return 0;
 	}
 	drop_table($tblname);
@@ -1060,11 +1061,13 @@ sub run_loader_test
 	# If we have some expected files to compare with, run in geography mode.
 	if ( ! run_loader_and_check_output("geog test", $tblname, "${TEST}-G.sql.expected", "${TEST}-G.select.expected", "-G $custom_opts") )
 	{
+		drop_table($tblname) unless $OPT_NODROP;
 		return 0;
 	}
 	# If we have some expected files to compare with, run the dumper and compare shape files.
 	if ( ! run_dumper_and_check_output("dumper geog test", $tblname, "${TEST}-G.shp.expected") )
 	{
+		drop_table($tblname) unless $OPT_NODROP;
 		return 0;
 	}
 	drop_table($tblname);
@@ -1072,11 +1075,13 @@ sub run_loader_test
 	# Always run in wkb ("normal") mode, even if there are no expected files to compare with.
 	if( ! run_loader_and_check_output("wkb test", $tblname, "${TEST}.sql.expected", "${TEST}.select.expected", "$custom_opts", "true") )
 	{
+		drop_table($tblname) unless $OPT_NODROP;
 		return 0;
 	}
 	# If we have some expected files to compare with, run the dumper and compare shape files.
 	if( ! run_dumper_and_check_output("dumper wkb test", $tblname, "${TEST}.shp.expected") )
 	{
+		drop_table($tblname) unless $OPT_NODROP;
 		return 0;
 	}
 	drop_table($tblname);
@@ -1087,6 +1092,7 @@ sub run_loader_test
 		# If we have some expected files to compare with, run in wkt dump mode.
 		if ( ! run_loader_and_check_output("wkt dump test", $tblname, "${TEST}-wD.sql.expected") )
 		{
+			drop_table($tblname) unless $OPT_NODROP;
 			return 0;
 		}
 		drop_table($tblname);
@@ -1094,6 +1100,7 @@ sub run_loader_test
 		# If we have some expected files to compare with, run in wkt dump mode.
 		if ( ! run_loader_and_check_output("geog dump test", $tblname, "${TEST}-GD.sql.expected") )
 		{
+			drop_table($tblname) unless $OPT_NODROP;
 			return 0;
 		}
 		drop_table($tblname);
@@ -1101,6 +1108,7 @@ sub run_loader_test
 		# If we have some expected files to compare with, run in wkb dump mode.
 		if ( ! run_loader_and_check_output("wkb dump test", $tblname, "${TEST}-D.sql.expected") )
 		{
+			drop_table($tblname) unless $OPT_NODROP;
 			return 0;
 		}
 		drop_table($tblname);

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

Summary of changes:
 regress/run_test.pl | 8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
PostGIS