[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha1-103-g9967380

[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  99673801108be0fa2a68e7f40fa08954c724bb42 (commit)
      from  10c405f3faa48485354be22dc648daafb5a0b3f4 (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 99673801108be0fa2a68e7f40fa08954c724bb42
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon May 4 19:40:20 2020 +0200

    Make run_test.pl fail if -pre.pl scripts fail
    
    ... fix those which may fail for no reason ...

diff --git a/raster/test/regress/loader/TiledAutoSkipNoData-pre.pl b/raster/test/regress/loader/TiledAutoSkipNoData-pre.pl
index 78c6cfa..7f040fe 100755
--- a/raster/test/regress/loader/TiledAutoSkipNoData-pre.pl
+++ b/raster/test/regress/loader/TiledAutoSkipNoData-pre.pl
@@ -1 +1,2 @@
-link "loader/testraster2.tif", "loader/TiledAutoSkipNoData.tif";
+link "loader/testraster2.tif", "loader/TiledAutoSkipNoData.tif"
+unless -f "loader/TiledAutoSkipNoData.tif";
diff --git a/regress/run_test.pl b/regress/run_test.pl
index dd7cdb0..17a4e18 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -478,7 +478,12 @@ foreach $TEST (@ARGV)
 	$TEST_OBJ_COUNT_PRE = count_postgis_objects();
 
 	# Check for a "-pre.pl" file in case there are setup commands
-    eval_file("${TEST}-pre.pl");
+	unless ( eval_file("${TEST}-pre.pl") )
+	{
+		chop($@);
+		fail("Failed evaluating ${TEST}-pre.pl: $@");
+		next;
+	}
 
 	# Check for a "-pre.sql" file in case there is setup SQL needed before
 	# the test can be run.
@@ -529,7 +534,7 @@ foreach $TEST (@ARGV)
 	}
 
 	# Check for a "-post.pl" file in case there are teardown commands
-    eval_file("${TEST}-post.pl");
+	eval_file("${TEST}-post.pl");
 
 	$TEST_OBJ_COUNT_POST = count_postgis_objects();
 
@@ -743,12 +748,10 @@ sub eval_file
     my $pl;
     if ( -r $file )
     {
-        #open(PL, $file);
-        #$pl = <PL>;
-        #close(PL);
-        #eval($pl);
-				do $file;
+				do $file or return 0;
+				#system($^X, $file) == 0 or return 0;
     }
+		1;
 }
 
 ##################################################################

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

Summary of changes:
 raster/test/regress/loader/TiledAutoSkipNoData-pre.pl |  3 ++-
 regress/run_test.pl                                   | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS