[SCM] PostGIS branch master updated. 3.4.0rc1-959-g96fb256d7

[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  96fb256d7f998621d490ae3e37987072c86634d6 (commit)
      from  340197426c7fcaa4b7e79c74cabd98a688cc6b89 (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 96fb256d7f998621d490ae3e37987072c86634d6
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Mar 1 11:14:30 2024 +0100

    Do not discard errors from loading sql files (run_test.pl)
    
    This was broken by previous commit

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 246a9546c..a3724bf82 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -1591,7 +1591,7 @@ sub load_sql_file
         $cmd .= "-c 'SET search_path TO $OPT_SCHEMA,topology'";
         $cmd .= " -v \"opt_dumprestore=${OPT_DUMPRESTORE}\"";
         $cmd .= " -v \"regdir=$REGDIR\"";
-        $cmd .= " -Xf $file $DB 2>&1 | tee -a $REGRESS_LOG > $tmplog";
+        $cmd .= " -Xf $file $DB > $tmplog 2>&1";
         #print "  $file\n" if $VERBOSE;
         my $rv = system($cmd);
         if ( $rv )
@@ -1608,6 +1608,8 @@ sub load_sql_file
                 return 0;
             }
         }
+
+        system("cat $tmplog >> $REGRESS_LOG");
     }
     elsif ( $strict )
     {

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

Summary of changes:
 regress/run_test.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS