[postgis-tickets] [SCM] PostGIS branch out-of-tree-builds updated. 3.2.0-323-gf964f6f2a
git at osgeo.org
git at osgeo.org
Thu Jan 20 11:34:57 PST 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, out-of-tree-builds has been updated
via f964f6f2ad72d58cc534f318f36f2d84a4024539 (commit)
via d9948dc9929d3c96bf09e48ebde221f748582fcb (commit)
from bd233ac1489c69678eebd6dd94acca394973c76e (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 f964f6f2ad72d58cc534f318f36f2d84a4024539
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 20 20:34:34 2022 +0100
Fix out-of-tree topology regression tests
diff --git a/topology/test/Makefile.in b/topology/test/Makefile.in
index 1636c71c1..9f6c8020d 100644
--- a/topology/test/Makefile.in
+++ b/topology/test/Makefile.in
@@ -41,14 +41,14 @@ edit:
$(PSQL) -X -f edit_topology.sql $(DATABASE)
-topo_predicates.sql: predicates.sql.in
- cpp -P -traditional-cpp predicates.sql.in | sed -e 's:@COLUMN@:feature:g;s:@SCHEMA@:topology.:g' > topo_predicates.sql
+topo_predicates.sql: predicates.sql.in Makefile
+ cpp -P -traditional-cpp $< | sed -e 's:@COLUMN@:feature:g;s:@SCHEMA@:topology.:g' > $@
-load_topology.sql: load_topology.sql.in
- cpp -P -traditional-cpp load_topology.sql.in | sed -e 's:@SRID@:-1:g' > load_topology.sql
+load_topology.sql: load_topology.sql.in Makefile
+ cpp -P -traditional-cpp $< | sed -e 's:@SRID@:-1:g' > $@
-load_topology-4326.sql: load_topology.sql.in
- cpp -P -traditional-cpp load_topology.sql.in | sed -e 's:@SRID@:4326:g' > load_topology-4326.sql
+load_topology-4326.sql: load_topology.sql.in Makefile
+ cpp -P -traditional-cpp $< | sed -e 's:@SRID@:4326:g' > $@
clean distclean:
rm -f topo_predicates.sql load_topology.sql load_topology-4326.sql
diff --git a/topology/test/regress/cleartopogeom.sql b/topology/test/regress/cleartopogeom.sql
index e8d8c5797..4462d7416 100644
--- a/topology/test/regress/cleartopogeom.sql
+++ b/topology/test/regress/cleartopogeom.sql
@@ -1,7 +1,7 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
\i ../load_features.sql
SELECT 'relation before', count(distinct topogeo_id)
diff --git a/topology/test/regress/copytopology.sql b/topology/test/regress/copytopology.sql
index aca4a2a34..6602b0aed 100644
--- a/topology/test/regress/copytopology.sql
+++ b/topology/test/regress/copytopology.sql
@@ -1,6 +1,6 @@
set client_min_messages to WARNING;
-\i ../load_topology-4326.sql
+\i :top_builddir/topology/test/load_topology-4326.sql
\i ../load_features.sql
\i ../more_features.sql
diff --git a/topology/test/regress/getfacecontainingpoint.sql b/topology/test/regress/getfacecontainingpoint.sql
index df7a48581..16e80ad1a 100644
--- a/topology/test/regress/getfacecontainingpoint.sql
+++ b/topology/test/regress/getfacecontainingpoint.sql
@@ -1,7 +1,7 @@
\set VERBOSITY terse
set client_min_messages to WARNING;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
-- Add holes touching shell defined in CW order
SELECT NULL FROM topology.TopoGeo_addLineString('city_data', 'LINESTRING(24 14, 23 17,25 17, 24 14)');
diff --git a/topology/test/regress/getnodeedges.sql b/topology/test/regress/getnodeedges.sql
index e4198b1a1..d2daebf1c 100644
--- a/topology/test/regress/getnodeedges.sql
+++ b/topology/test/regress/getnodeedges.sql
@@ -1,6 +1,6 @@
set client_min_messages to ERROR;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
SELECT 'N'||node_id, (topology.GetNodeEdges('city_data', node_id)).*
FROM city_data.node ORDER BY node_id, sequence;
diff --git a/topology/test/regress/getringedges.sql b/topology/test/regress/getringedges.sql
index 6d23626a4..d54f53df3 100644
--- a/topology/test/regress/getringedges.sql
+++ b/topology/test/regress/getringedges.sql
@@ -1,6 +1,6 @@
set client_min_messages to ERROR;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
-- Test bogus calls
SELECT 'non-existent-topo', topology.GetRingEdges('non-existent', 1);
diff --git a/topology/test/regress/gettopogeomelements.sql b/topology/test/regress/gettopogeomelements.sql
index e3a70afc5..03efdfcc7 100644
--- a/topology/test/regress/gettopogeomelements.sql
+++ b/topology/test/regress/gettopogeomelements.sql
@@ -1,6 +1,6 @@
set client_min_messages to WARNING;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
\i ../load_features.sql
SELECT lid, tid, GetTopoGeomElements('city_data', lid, tid)
diff --git a/topology/test/regress/gml.sql b/topology/test/regress/gml.sql
index 0582ca7cb..2a7b168b0 100644
--- a/topology/test/regress/gml.sql
+++ b/topology/test/regress/gml.sql
@@ -1,6 +1,6 @@
set client_min_messages to WARNING;
-\i ../load_topology-4326.sql
+\i :top_builddir/topology/test/load_topology-4326.sql
\i ../load_features.sql
\i ../more_features.sql
diff --git a/topology/test/regress/legacy_predicate.sql b/topology/test/regress/legacy_predicate.sql
index 88ee4da42..a644c2e28 100644
--- a/topology/test/regress/legacy_predicate.sql
+++ b/topology/test/regress/legacy_predicate.sql
@@ -1,10 +1,10 @@
set client_min_messages to WARNING;
-\i ../load_topology.sql
-\i ../load_features.sql
-\i ../more_features.sql
-\i ../hierarchy.sql
-\i ../topo_predicates.sql
+\i :top_builddir/topology/test/load_topology.sql
+\i :regdir/../topology/test/load_features.sql
+\i :regdir/../topology/test/more_features.sql
+\i :regdir/../topology/test/hierarchy.sql
+\i :top_builddir/topology/test/topo_predicates.sql
-- clean up
SELECT topology.DropTopology('city_data');
diff --git a/topology/test/regress/legacy_query.sql b/topology/test/regress/legacy_query.sql
index 21d0fd39e..3729773a9 100644
--- a/topology/test/regress/legacy_query.sql
+++ b/topology/test/regress/legacy_query.sql
@@ -2,7 +2,7 @@ set client_min_messages to WARNING;
-- Tests TopoGeometry->Geometry cast and id(TopoGeometry)
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
\i ../load_features.sql
\i ../more_features.sql
\i ../hierarchy.sql
diff --git a/topology/test/regress/legacy_validate.sql b/topology/test/regress/legacy_validate.sql
index 1dd8f0428..a3985621b 100644
--- a/topology/test/regress/legacy_validate.sql
+++ b/topology/test/regress/legacy_validate.sql
@@ -1,6 +1,6 @@
set client_min_messages to WARNING;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
\i ../validate_topology.sql
-- clean up
diff --git a/topology/test/regress/st_addedgemodface.sql b/topology/test/regress/st_addedgemodface.sql
index 047bd6c45..c39424f73 100644
--- a/topology/test/regress/st_addedgemodface.sql
+++ b/topology/test/regress/st_addedgemodface.sql
@@ -1,6 +1,6 @@
set client_min_messages to ERROR;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
-- Endpoint / node mismatch
SELECT topology.ST_AddEdgeModFace('city_data', 7, 6,
diff --git a/topology/test/regress/st_addedgenewfaces.sql b/topology/test/regress/st_addedgenewfaces.sql
index db90018b9..af25a0a21 100644
--- a/topology/test/regress/st_addedgenewfaces.sql
+++ b/topology/test/regress/st_addedgenewfaces.sql
@@ -1,6 +1,6 @@
set client_min_messages to ERROR;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
-- Endpoint / node mismatch
SELECT topology.ST_AddEdgeNewFaces('city_data', 7, 6,
diff --git a/topology/test/regress/st_addisonode.sql b/topology/test/regress/st_addisonode.sql
index 2a9678db9..09827a627 100644
--- a/topology/test/regress/st_addisonode.sql
+++ b/topology/test/regress/st_addisonode.sql
@@ -3,7 +3,7 @@ set client_min_messages to WARNING;
-- Usual city_data input
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
-- NULL exceptions
select ST_AddIsoNode(NULL, 0, 'POINT(1 4)');
diff --git a/topology/test/regress/st_changeedgegeom.sql b/topology/test/regress/st_changeedgegeom.sql
index bc1887818..1d8a6395e 100644
--- a/topology/test/regress/st_changeedgegeom.sql
+++ b/topology/test/regress/st_changeedgegeom.sql
@@ -1,6 +1,6 @@
set client_min_messages to ERROR;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
-- good one
SELECT 'T1', topology.ST_ChangeEdgeGeom('city_data', 25,
diff --git a/topology/test/regress/st_modedgeheal.sql b/topology/test/regress/st_modedgeheal.sql
index b00c87eac..628c470d7 100644
--- a/topology/test/regress/st_modedgeheal.sql
+++ b/topology/test/regress/st_modedgeheal.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
SELECT topology.ST_ModEdgeHeal('city_data', 1, null);
SELECT topology.ST_ModEdgeHeal('city_data', null, 1);
diff --git a/topology/test/regress/st_modedgesplit.sql b/topology/test/regress/st_modedgesplit.sql
index 98310fe34..fa7fb00d4 100644
--- a/topology/test/regress/st_modedgesplit.sql
+++ b/topology/test/regress/st_modedgesplit.sql
@@ -3,7 +3,7 @@
set client_min_messages to WARNING;
-- Import city_data
-\i ../load_topology-4326.sql
+\i :top_builddir/topology/test/load_topology-4326.sql
-- Save max node id
select 'node'::text as what, max(node_id) INTO city_data.limits FROM city_data.node;
diff --git a/topology/test/regress/st_moveisonode.sql b/topology/test/regress/st_moveisonode.sql
index feb544fc5..2457a3967 100644
--- a/topology/test/regress/st_moveisonode.sql
+++ b/topology/test/regress/st_moveisonode.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
-- Isolated node to invalid location (coincident)
SELECT 'coincident_node', topology.ST_MoveIsoNode('city_data', 4, 'POINT(25 35)');
diff --git a/topology/test/regress/st_newedgeheal.sql b/topology/test/regress/st_newedgeheal.sql
index 51bf3157f..a97ec9791 100644
--- a/topology/test/regress/st_newedgeheal.sql
+++ b/topology/test/regress/st_newedgeheal.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
SELECT topology.ST_NewEdgeHeal('city_data', 1, null);
SELECT topology.ST_NewEdgeHeal('city_data', null, 1);
diff --git a/topology/test/regress/st_newedgessplit.sql b/topology/test/regress/st_newedgessplit.sql
index abaeafd97..075f599b3 100644
--- a/topology/test/regress/st_newedgessplit.sql
+++ b/topology/test/regress/st_newedgessplit.sql
@@ -3,7 +3,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i ../load_topology-4326.sql
+\i :top_builddir/topology/test/load_topology-4326.sql
-- Save max node id
select 'node'::text as what, max(node_id) INTO city_data.limits FROM city_data.node;
diff --git a/topology/test/regress/st_remedgemodface.sql b/topology/test/regress/st_remedgemodface.sql
index a8ac67434..320571da2 100644
--- a/topology/test/regress/st_remedgemodface.sql
+++ b/topology/test/regress/st_remedgemodface.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i ../load_topology-4326.sql
+\i :top_builddir/topology/test/load_topology-4326.sql
-- Utility functions for the test {
@@ -375,7 +375,7 @@ SELECT topology.DropTopology('city_data');
-- {
-- Import city_data
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
\i ../load_features.sql
\i ../cache_geometries.sql
diff --git a/topology/test/regress/st_remedgenewface.sql b/topology/test/regress/st_remedgenewface.sql
index c5f5413ba..ebaa42207 100644
--- a/topology/test/regress/st_remedgenewface.sql
+++ b/topology/test/regress/st_remedgenewface.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i ../load_topology-4326.sql
+\i :top_builddir/topology/test/load_topology-4326.sql
-- Utility functions for the test {
@@ -375,7 +375,7 @@ SELECT topology.DropTopology('city_data');
-- {
-- Import city_data
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
\i ../load_features.sql
\i ../cache_geometries.sql
diff --git a/topology/test/regress/st_removeisoedge.sql b/topology/test/regress/st_removeisoedge.sql
index 38a2db0ad..afe686f30 100644
--- a/topology/test/regress/st_removeisoedge.sql
+++ b/topology/test/regress/st_removeisoedge.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
CREATE TABLE city_data.f_lin(id serial primary key);
SELECT NULL FROM AddTopoGeometryColumn('city_data', 'city_data', 'f_lin', 'tg', 'LINE');
diff --git a/topology/test/regress/st_removeisonode.sql b/topology/test/regress/st_removeisonode.sql
index ea25c67d6..5551195dc 100644
--- a/topology/test/regress/st_removeisonode.sql
+++ b/topology/test/regress/st_removeisonode.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
-- Non isolated node (is used by an edge);
SELECT 'non-iso', topology.ST_RemoveIsoNode('city_data', 1);
diff --git a/topology/test/regress/topogeo_addlinestring.sql b/topology/test/regress/topogeo_addlinestring.sql
index 60cabfe26..7a9a871ca 100644
--- a/topology/test/regress/topogeo_addlinestring.sql
+++ b/topology/test/regress/topogeo_addlinestring.sql
@@ -1,7 +1,7 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-\i ../load_topology-4326.sql
+\i :top_builddir/topology/test/load_topology-4326.sql
-- Save max node id
select 'node'::text as what, max(node_id) INTO city_data.limits FROM city_data.node;
diff --git a/topology/test/regress/topogeo_addpoint.sql b/topology/test/regress/topogeo_addpoint.sql
index 3f7cd3e80..155db91af 100644
--- a/topology/test/regress/topogeo_addpoint.sql
+++ b/topology/test/regress/topogeo_addpoint.sql
@@ -1,7 +1,7 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
-- Invalid calls
SELECT 'invalid', TopoGeo_addPoint('city_data', 'LINESTRING(36 26, 38 30)');
diff --git a/topology/test/regress/topogeo_addpolygon.sql b/topology/test/regress/topogeo_addpolygon.sql
index 68863b0b5..f7ace00a1 100644
--- a/topology/test/regress/topogeo_addpolygon.sql
+++ b/topology/test/regress/topogeo_addpolygon.sql
@@ -1,7 +1,7 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
-- Save max node,edge and face ids
select 'node'::text as what, max(node_id) INTO city_data.limits FROM city_data.node;
diff --git a/topology/test/regress/topogeometry_srid.sql b/topology/test/regress/topogeometry_srid.sql
index af455d4f5..08fe7dafa 100644
--- a/topology/test/regress/topogeometry_srid.sql
+++ b/topology/test/regress/topogeometry_srid.sql
@@ -1,6 +1,6 @@
set client_min_messages to WARNING;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
\i ../load_features.sql
\i ../more_features.sql
\i ../hierarchy.sql
diff --git a/topology/test/regress/topogeometry_type.sql b/topology/test/regress/topogeometry_type.sql
index 4da8a3167..1970898fc 100644
--- a/topology/test/regress/topogeometry_type.sql
+++ b/topology/test/regress/topogeometry_type.sql
@@ -1,6 +1,6 @@
set client_min_messages to WARNING;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
\i ../load_features.sql
\i ../more_features.sql
\i ../hierarchy.sql
diff --git a/topology/test/regress/topojson.sql b/topology/test/regress/topojson.sql
index e5ccf1444..1305ac58f 100644
--- a/topology/test/regress/topojson.sql
+++ b/topology/test/regress/topojson.sql
@@ -1,6 +1,6 @@
set client_min_messages to WARNING;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
\i ../load_features.sql
\i ../hierarchy.sql
diff --git a/topology/test/regress/validatetopology.sql b/topology/test/regress/validatetopology.sql
index 2d7caeaa5..d18067dc6 100644
--- a/topology/test/regress/validatetopology.sql
+++ b/topology/test/regress/validatetopology.sql
@@ -49,7 +49,8 @@ SELECT null from ( select topology.DropTopology('t') ) as dt;
-- Following tests will use the city_data topology as a base
-------------------------------------------------------------
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
+
SELECT 'unexpected_city_data_invalidities', * FROM ValidateTopology('city_data');
-- Test correctness of edge linking
diff --git a/topology/test/regress/validatetopologyrelation.sql b/topology/test/regress/validatetopologyrelation.sql
index 36ab03651..c8edc01f0 100644
--- a/topology/test/regress/validatetopologyrelation.sql
+++ b/topology/test/regress/validatetopologyrelation.sql
@@ -2,7 +2,7 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-\i ../load_topology.sql
+\i :top_builddir/topology/test/load_topology.sql
\i ../load_features.sql
\i ../hierarchy.sql
--\i ../more_features.sql
commit d9948dc9929d3c96bf09e48ebde221f748582fcb
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 20 19:55:52 2022 +0100
Add top_builddir variable
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 21507a565..475928e0a 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -400,6 +400,7 @@ foreach $TEST (@ARGV)
# TODO: add more variables?
my $cmd = "psql -Xq"
. " -v \"regdir=$REGDIR\""
+ . " -v \"top_builddir=$TOP_BUILDDIR\""
. " -v \"scriptdir=$scriptdir\""
. " -v \"schema=$OPT_SCHEMA.\""
# TODO: inject search_path somehow
@@ -660,6 +661,7 @@ sub run_simple_sql
my $tmpfile = sprintf("%s/test_%s_tmp", $TMPDIR, $RUN);
my $cmd = "psql -v \"VERBOSITY=terse\" "
. " -v \"regdir=$REGDIR\""
+ . " -v \"top_builddir=$TOP_BUILDDIR\""
. " -tXAq $DB < $sql > $tmpfile 2>&1";
#print($cmd);
my $rv = system($cmd);
@@ -757,6 +759,7 @@ sub run_simple_test
. " -v \"tmpfile='$tmpfile'\""
. " -v \"scriptdir=$scriptdir\""
. " -v \"regdir=$REGDIR\""
+ . " -v \"top_builddir=$TOP_BUILDDIR\""
. " -v \"schema=$OPT_SCHEMA.\""
. " -c \"SET search_path TO public,$OPT_SCHEMA,topology\""
. " -tXAq -f $sqlfile $DB > $outfile 2>&1";
-----------------------------------------------------------------------
Summary of changes:
regress/run_test.pl | 3 +++
topology/test/Makefile.in | 12 ++++++------
topology/test/regress/cleartopogeom.sql | 2 +-
topology/test/regress/copytopology.sql | 2 +-
topology/test/regress/getfacecontainingpoint.sql | 2 +-
topology/test/regress/getnodeedges.sql | 2 +-
topology/test/regress/getringedges.sql | 2 +-
topology/test/regress/gettopogeomelements.sql | 2 +-
topology/test/regress/gml.sql | 2 +-
topology/test/regress/legacy_predicate.sql | 10 +++++-----
topology/test/regress/legacy_query.sql | 2 +-
topology/test/regress/legacy_validate.sql | 2 +-
topology/test/regress/st_addedgemodface.sql | 2 +-
topology/test/regress/st_addedgenewfaces.sql | 2 +-
topology/test/regress/st_addisonode.sql | 2 +-
topology/test/regress/st_changeedgegeom.sql | 2 +-
topology/test/regress/st_modedgeheal.sql | 2 +-
topology/test/regress/st_modedgesplit.sql | 2 +-
topology/test/regress/st_moveisonode.sql | 2 +-
topology/test/regress/st_newedgeheal.sql | 2 +-
topology/test/regress/st_newedgessplit.sql | 2 +-
topology/test/regress/st_remedgemodface.sql | 4 ++--
topology/test/regress/st_remedgenewface.sql | 4 ++--
topology/test/regress/st_removeisoedge.sql | 2 +-
topology/test/regress/st_removeisonode.sql | 2 +-
topology/test/regress/topogeo_addlinestring.sql | 2 +-
topology/test/regress/topogeo_addpoint.sql | 2 +-
topology/test/regress/topogeo_addpolygon.sql | 2 +-
topology/test/regress/topogeometry_srid.sql | 2 +-
topology/test/regress/topogeometry_type.sql | 2 +-
topology/test/regress/topojson.sql | 2 +-
topology/test/regress/validatetopology.sql | 3 ++-
topology/test/regress/validatetopologyrelation.sql | 2 +-
33 files changed, 47 insertions(+), 43 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list