[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha1-135-g0a94d7b
git at osgeo.org
git at osgeo.org
Thu Jun 18 08:35:54 PDT 2020
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 0a94d7bd49c9ac4f7f9c71217c703ab7f8a991dd (commit)
from 67c9189a4d9d41043bd5dce93a726eb06bf17402 (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 0a94d7bd49c9ac4f7f9c71217c703ab7f8a991dd
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jun 18 17:34:36 2020 +0200
Add support for passing options to dumper tests
See #4705
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 941fad7..e98e951 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -1173,7 +1173,7 @@ sub run_loader_test
#
# input is ${TEST}.dmp, where last line is considered to be the
# [table|query] argument for pgsql2shp and all the previous lines,
-# if any are
+# if any are options.
#
##################################################################
sub run_dumper_test
@@ -1189,12 +1189,16 @@ sub run_dumper_test
# Produce the output SHP file.
open DUMPFILE, "$dump_file" or die "Cannot open dump file $dump_file\n";
- sleep(1);
+ sleep(1); # why ??
my @dumplines = <DUMPFILE>;
close DUMPFILE;
- my $dumpstring = join '', @dumplines;
- chop($dumpstring);
- my @cmd = ("${PGSQL2SHP}", "-f", ${shpfile}, ${DB}, ${dumpstring});
+ chop(@dumplines);
+ my $dumpstring = shift @dumplines;
+ my @cmd = ("${PGSQL2SHP}", "-f", ${shpfile});
+ push @cmd, @dumplines;
+ push @cmd, ${DB};
+ push @cmd, $dumpstring;
+ #print "CMD: " . join (' ', @cmd) . "\n";
open my $stdout_save, '>&', *STDOUT or die "Cannot dup stdout\n";
open my $stderr_save, '>&', *STDERR or die "Cannot dup stdout\n";
open STDOUT, ">${outfile}" or die "Cannot write to ${outfile}\n";
-----------------------------------------------------------------------
Summary of changes:
regress/run_test.pl | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list