[postgis-tickets] [SCM] PostGIS branch stable-3.1 updated. 3.1.6-34-gaafe1ff38

[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, stable-3.1 has been updated
       via  aafe1ff388ecc51fac0d296fc7a3d57cd1913f01 (commit)
      from  e99ac24ec2783248fb1e97baaccdb5382da010b7 (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 aafe1ff388ecc51fac0d296fc7a3d57cd1913f01
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Aug 18 08:24:34 2022 +0200

    run_test.pl: always pass --quiet to psql
    
    Removes the need to filter out lines ourselves from perl
    Drop manual QUIET setting from regress tests

diff --git a/regress/core/regress_big_polygon.sql b/regress/core/regress_big_polygon.sql
index 8bcf9fe77..91bc13d47 100644
--- a/regress/core/regress_big_polygon.sql
+++ b/regress/core/regress_big_polygon.sql
@@ -1,9 +1,7 @@
-\set QUIET on
 SET client_min_messages TO WARNING;
 drop table if exists big_polygon;
 create table big_polygon(geom geometry);
 alter table big_polygon alter column geom set storage main;
 -- Data (c) OpenStreetMap contributors, ODbL / http://osm.org/
 \copy big_polygon from 'big_polygon.wkb'
-\set QUIET off
 SET client_min_messages TO NOTICE;
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 4709abd9a..ee50ffdf1 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -723,7 +723,7 @@ sub drop_table
 sub sql
 {
 	my $sql = shift;
-	my $result = `psql -tXA -d $DB -c 'SET search_path TO public,$OPT_SCHEMA' -c "$sql" | sed '/^SET\$/d'`;
+	my $result = `psql -qtXA -d $DB -c 'SET search_path TO public,$OPT_SCHEMA' -c "$sql" | sed '/^SET\$/d'`;
 	$result =~ s/[\n\r]*$//;
 	$result;
 }
@@ -799,14 +799,6 @@ sub run_simple_test
 	close(FILE);
 
 	# Strip the lines we don't care about
-	@lines = grep(!/^\$/, @lines);
-	## TODO: Figure out why this fails on windows
-	#@lines = grep(!/^(INSERT|DELETE|UPDATE|SELECT [0-9]*|COPY|DO)$/, @lines);
-	@lines = grep(!/^(INSERT|DELETE|UPDATE|SELECT|COPY|DO)/, @lines);
-	@lines = grep(!/^(CONTEXT|RESET|ANALYZE)/, @lines);
-	@lines = grep(!/^(DROP|CREATE|ALTER|VACUUM)/, @lines);
-	@lines = grep(!/^(LOG|SET|TRUNCATE|DISCARD)/, @lines);
-	@lines = grep(!/^LINE \d/, @lines);
 	@lines = grep(!/^\s+$/, @lines);
 
 	# Morph values into expected forms
@@ -889,7 +881,7 @@ sub run_loader_and_check_output
 	my $errfile = "${TMPDIR}/loader.err";
 
 	# ON_ERROR_STOP is used by psql to return non-0 on an error
-	my $psql_opts = " --no-psqlrc --variable ON_ERROR_STOP=true";
+	my $psql_opts = " --quiet --no-psqlrc --variable ON_ERROR_STOP=true";
 
 	if ( $run_always || -r $expected_sql_file || -r $expected_select_results_file )
 	{

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

Summary of changes:
 regress/core/regress_big_polygon.sql |  2 --
 regress/run_test.pl                  | 12 ++----------
 2 files changed, 2 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
PostGIS