[postgis-tickets] [SCM] PostGIS branch stable-3.1-quiet-psql created. 3.1.6-34-g17cf78dec
git at osgeo.org
git at osgeo.org
Thu Aug 18 00:50:24 PDT 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, stable-3.1-quiet-psql has been created
at 17cf78dec65e360b6f6844b7638b6eda80ddb526 (commit)
- Log -----------------------------------------------------------------
commit 17cf78dec65e360b6f6844b7638b6eda80ddb526
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
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 )
{
-----------------------------------------------------------------------
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list