[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-101-g47e75c4
git at osgeo.org
git at osgeo.org
Wed Oct 28 14:15:29 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 47e75c49349ad1b89a9b93605cfe98211744180f (commit)
from 50b1e70b1a9d14b2e152dce4416247149ac3f77c (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 47e75c49349ad1b89a9b93605cfe98211744180f
Author: Sandro Santilli <strk at kbt.io>
Date: Wed Oct 28 22:12:55 2020 +0100
Load each regress test in its own directory
Closes #4777 by making it allowed to use hard-coded paths
Update topology tests so hard-coded paths are relative to the
script file rather than the supposed calling path, allowing
them to be run from any directory too
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 8497ae4..d19adf2 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -789,13 +789,15 @@ sub run_simple_test
chmod 0777, $betmpdir;
my $scriptdir = scriptdir($libver, $OPT_EXTENSIONS);
- my $cmd = "psql -v \"VERBOSITY=terse\""
+
+ my ($sqlfile,$sqldir) = fileparse($sql);
+ my $cmd = "cd $sqldir; psql -v \"VERBOSITY=terse\""
. " -v \"tmpfile='$tmpfile'\""
. " -v \"scriptdir=$scriptdir\""
. " -v \"regdir=$REGDIR\""
. " -v \"schema=$OPT_SCHEMA.\""
. " -c \"SET search_path TO public,$OPT_SCHEMA,topology\""
- . " -tXAq -f $sql $DB > $outfile 2>&1";
+ . " -tXAq -f $sqlfile $DB > $outfile 2>&1";
my $rv = system($cmd);
# Check for ERROR lines
diff --git a/topology/test/regress/cleartopogeom.sql b/topology/test/regress/cleartopogeom.sql
index e3697db..6f27f76 100644
--- a/topology/test/regress/cleartopogeom.sql
+++ b/topology/test/regress/cleartopogeom.sql
@@ -1,8 +1,8 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-\i load_topology.sql
-\i load_features.sql
+\i ../load_topology.sql
+\i ../load_features.sql
SELECT 'relation before', count(distinct topogeo_id)
FROM city_data.relation
diff --git a/topology/test/regress/copytopology.sql b/topology/test/regress/copytopology.sql
index 7440828..aca4a2a 100644
--- a/topology/test/regress/copytopology.sql
+++ b/topology/test/regress/copytopology.sql
@@ -1,8 +1,8 @@
set client_min_messages to WARNING;
-\i load_topology-4326.sql
-\i load_features.sql
-\i more_features.sql
+\i ../load_topology-4326.sql
+\i ../load_features.sql
+\i ../more_features.sql
SELECT topology.CopyTopology('city_data', 'CITY_data_UP_down') > 0;
diff --git a/topology/test/regress/getnodeedges.sql b/topology/test/regress/getnodeedges.sql
index f5f8e3e..e4198b1 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 ../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 20874e5..88b4bd4 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 ../load_topology.sql
SELECT 'R'||edge_id, (topology.GetRingEdges('city_data', edge_id)).*
FROM city_data.edge;
diff --git a/topology/test/regress/gettopogeomelements.sql b/topology/test/regress/gettopogeomelements.sql
index 5d765ba..e3a70af 100644
--- a/topology/test/regress/gettopogeomelements.sql
+++ b/topology/test/regress/gettopogeomelements.sql
@@ -1,7 +1,7 @@
set client_min_messages to WARNING;
-\i load_topology.sql
-\i load_features.sql
+\i ../load_topology.sql
+\i ../load_features.sql
SELECT lid, tid, GetTopoGeomElements('city_data', lid, tid)
FROM (
diff --git a/topology/test/regress/gml.sql b/topology/test/regress/gml.sql
index 58fcb51..0582ca7 100644
--- a/topology/test/regress/gml.sql
+++ b/topology/test/regress/gml.sql
@@ -1,8 +1,8 @@
set client_min_messages to WARNING;
-\i load_topology-4326.sql
-\i load_features.sql
-\i more_features.sql
+\i ../load_topology-4326.sql
+\i ../load_features.sql
+\i ../more_features.sql
--- Puntual single element {
diff --git a/topology/test/regress/legacy_invalid.sql b/topology/test/regress/legacy_invalid.sql
index 25187f4..bb2f916 100644
--- a/topology/test/regress/legacy_invalid.sql
+++ b/topology/test/regress/legacy_invalid.sql
@@ -1,6 +1,6 @@
set client_min_messages to WARNING;
-\i invalid_topology.sql
+\i ../invalid_topology.sql
-- clean up
SELECT topology.DropTopology('invalid_topology');
diff --git a/topology/test/regress/legacy_predicate.sql b/topology/test/regress/legacy_predicate.sql
index 567d2f6..88ee4da 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 ../load_topology.sql
+\i ../load_features.sql
+\i ../more_features.sql
+\i ../hierarchy.sql
+\i ../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 d0b903d..21d0fd3 100644
--- a/topology/test/regress/legacy_query.sql
+++ b/topology/test/regress/legacy_query.sql
@@ -2,11 +2,11 @@ set client_min_messages to WARNING;
-- Tests TopoGeometry->Geometry cast and id(TopoGeometry)
-\i load_topology.sql
-\i load_features.sql
-\i more_features.sql
-\i hierarchy.sql
-\i query_features.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../more_features.sql
+\i ../hierarchy.sql
+\i ../query_features.sql
-- clean up
SELECT topology.DropTopology('city_data');
diff --git a/topology/test/regress/legacy_validate.sql b/topology/test/regress/legacy_validate.sql
index d325e70..1dd8f04 100644
--- a/topology/test/regress/legacy_validate.sql
+++ b/topology/test/regress/legacy_validate.sql
@@ -1,7 +1,7 @@
set client_min_messages to WARNING;
-\i load_topology.sql
-\i validate_topology.sql
+\i ../load_topology.sql
+\i ../validate_topology.sql
-- clean up
SELECT topology.DropTopology('city_data');
diff --git a/topology/test/regress/st_addedgemodface.sql b/topology/test/regress/st_addedgemodface.sql
index 2939c22..047bd6c 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 ../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 71cfd99..db90018 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 ../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 5f97654..4413876 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 ../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 b86aab2..bc18878 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 ../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 2e86ece..8322992 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 ../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 c813d14..98310fe 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 ../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_newedgeheal.sql b/topology/test/regress/st_newedgeheal.sql
index c2b74dd..e49979f 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 ../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 6cedc97..abaeafd 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 ../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 101b475..a8ac674 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 ../load_topology-4326.sql
-- Utility functions for the test {
@@ -375,9 +375,9 @@ SELECT topology.DropTopology('city_data');
-- {
-- Import city_data
-\i load_topology.sql
-\i load_features.sql
-\i cache_geometries.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../cache_geometries.sql
-- A city_street is defined by edge 3, can't drop
SELECT '*RM(3)', topology.ST_RemEdgeModFace('city_data', 3);
diff --git a/topology/test/regress/st_remedgenewface.sql b/topology/test/regress/st_remedgenewface.sql
index 90cf30b..c5f5413 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 ../load_topology-4326.sql
-- Utility functions for the test {
@@ -375,9 +375,9 @@ SELECT topology.DropTopology('city_data');
-- {
-- Import city_data
-\i load_topology.sql
-\i load_features.sql
-\i cache_geometries.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../cache_geometries.sql
-- A city_street is defined by edge 3, can't drop
SELECT '*RN(3)', topology.ST_RemEdgeNewFace('city_data', 3);
diff --git a/topology/test/regress/topogeo_addlinestring.sql b/topology/test/regress/topogeo_addlinestring.sql
index 74de66e..03d3d00 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 ../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 b7c4f92..3f7cd3e 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 ../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 f21379f..68863b0 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 ../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_type.sql b/topology/test/regress/topogeometry_type.sql
index 05c21fe..4da8a31 100644
--- a/topology/test/regress/topogeometry_type.sql
+++ b/topology/test/regress/topogeometry_type.sql
@@ -1,9 +1,9 @@
set client_min_messages to WARNING;
-\i load_topology.sql
-\i load_features.sql
-\i more_features.sql
-\i hierarchy.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../more_features.sql
+\i ../hierarchy.sql
SELECT DISTINCT 'GeometryType(traffic_signs)',
geometrytype(feature) FROM features.traffic_signs;
diff --git a/topology/test/regress/topojson.sql b/topology/test/regress/topojson.sql
index 6a0aad4..e5ccf14 100644
--- a/topology/test/regress/topojson.sql
+++ b/topology/test/regress/topojson.sql
@@ -1,8 +1,8 @@
set client_min_messages to WARNING;
-\i load_topology.sql
-\i load_features.sql
-\i hierarchy.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../hierarchy.sql
-- This edges perturbate the topology so that walking around the boundaries
-- of P1 and P2 may require walking on some of them
-----------------------------------------------------------------------
Summary of changes:
regress/run_test.pl | 6 ++++--
topology/test/regress/cleartopogeom.sql | 4 ++--
topology/test/regress/copytopology.sql | 6 +++---
topology/test/regress/getnodeedges.sql | 2 +-
topology/test/regress/getringedges.sql | 2 +-
topology/test/regress/gettopogeomelements.sql | 4 ++--
topology/test/regress/gml.sql | 6 +++---
topology/test/regress/legacy_invalid.sql | 2 +-
topology/test/regress/legacy_predicate.sql | 10 +++++-----
topology/test/regress/legacy_query.sql | 10 +++++-----
topology/test/regress/legacy_validate.sql | 4 ++--
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_newedgeheal.sql | 2 +-
topology/test/regress/st_newedgessplit.sql | 2 +-
topology/test/regress/st_remedgemodface.sql | 8 ++++----
topology/test/regress/st_remedgenewface.sql | 8 ++++----
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_type.sql | 8 ++++----
topology/test/regress/topojson.sql | 6 +++---
26 files changed, 55 insertions(+), 53 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list