[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-112-gda75327

[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, master has been updated
       via  da7532753681e680fd3de7893f2aeb52f4caf4e2 (commit)
      from  d781ecf29220b0a09ec3484db7f24f3ed08d7d2d (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 da7532753681e680fd3de7893f2aeb52f4caf4e2
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Oct 29 12:03:42 2020 +0100

    Have topology regress test re-use global checker rule

diff --git a/topology/test/Makefile.in b/topology/test/Makefile.in
index 4ec466e..9783b03 100644
--- a/topology/test/Makefile.in
+++ b/topology/test/Makefile.in
@@ -35,61 +35,12 @@ load_topology-4326.sql: load_topology.sql.in
 clean distclean:
 	rm -f topo_predicates.sql load_topology.sql load_topology-4326.sql
 
-TESTS = regress/legacy_validate.sql regress/legacy_predicate.sql \
-	regress/legacy_invalid.sql regress/sqlmm.sql \
-	regress/legacy_query.sql regress/addnode.sql \
-	regress/addedge.sql regress/addface.sql \
-	regress/addface2.5d.sql \
-	regress/addtopogeometrycolumn.sql \
-	regress/polygonize.sql \
-	regress/st_addisoedge.sql \
-	regress/st_addisonode.sql \
-	regress/st_addedgemodface.sql \
-	regress/st_addedgenewfaces.sql \
-	regress/st_changeedgegeom.sql \
-	regress/st_createtopogeo.sql \
-	regress/st_getfacegeometry.sql \
-	regress/st_getfaceedges.sql \
-	regress/st_modedgeheal.sql \
-	regress/st_modedgesplit.sql \
-	regress/st_newedgeheal.sql \
-	regress/st_newedgessplit.sql \
-	regress/st_remedgenewface.sql \
-	regress/st_remedgemodface.sql \
-	regress/st_simplify.sql \
-	regress/topoelement.sql \
-	regress/topoelementarray_agg.sql \
-	regress/topogeo_addlinestring.sql \
-	regress/topogeo_addpoint.sql \
-	regress/topogeo_addpolygon.sql \
-  regress/topogeom_edit.sql \
-	regress/topogeometry_type.sql \
-	regress/topojson.sql \
-  regress/topologysummary.sql \
-	regress/topo2.5d.sql \
-	regress/totopogeom.sql \
-	regress/droptopology.sql \
-	regress/droptopogeometrycolumn.sql \
-	regress/copytopology.sql \
-	regress/createtopogeom.sql \
-	regress/createtopology.sql \
-	regress/gml.sql \
-	regress/getnodebypoint.sql \
-	regress/getedgebypoint.sql \
-	regress/getfacebypoint.sql \
-	regress/getringedges.sql \
-	regress/gettopogeomelements.sql \
-	regress/layertrigger.sql \
-	regress/validatetopology.sql
+check-regress: check
+check: topo_predicates.sql load_topology.sql load_topology-4326.sql
 
-TESTS_EXPECTED = $(TESTS:.sql=_expected)
+override RUNTESTFLAGS := $(RUNTESTFLAGS) --topology
 
-check: check-regress
+topsrcdir = $(realpath ../../)
 
-check-regress: topo_predicates.sql load_topology.sql load_topology-4326.sql $(TESTS) $(TESTS_EXPECTED)
-	$(MAKE) -C ../../regress staged-install
-	$(PERL) ../../regress/run_test.pl --topology $(RUNTESTFLAGS) $(TESTS)
-	# only run upgrade test if RUNTESTFLAGS was not already doing that
-	if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
-		$(PERL) ../../regress/run_test.pl --upgrade --topology $(RUNTESTFLAGS) $(TESTS); \
-	fi
+include tests.mk
+include ../../regress/runtest.mk
diff --git a/topology/test/tests.mk b/topology/test/tests.mk
new file mode 100644
index 0000000..f46097a
--- /dev/null
+++ b/topology/test/tests.mk
@@ -0,0 +1,64 @@
+# **********************************************************************
+# *
+# * PostGIS - Spatial Types for PostgreSQL
+# * http://postgis.net
+# *
+# * Copyright (C) 2020 Sandro Santilli <strk at kbt.io>
+# *
+# * This is free software; you can redistribute and/or modify it under
+# * the terms of the GNU General Public Licence. See the COPYING file.
+# *
+# **********************************************************************
+
+TESTS += \
+  $(topsrcdir)/topology/test/regress/addedge.sql \
+	$(topsrcdir)/topology/test/regress/addface2.5d.sql \
+  $(topsrcdir)/topology/test/regress/addface.sql \
+	$(topsrcdir)/topology/test/regress/addnode.sql \
+	$(topsrcdir)/topology/test/regress/addtopogeometrycolumn.sql \
+	$(topsrcdir)/topology/test/regress/copytopology.sql \
+	$(topsrcdir)/topology/test/regress/createtopogeom.sql \
+	$(topsrcdir)/topology/test/regress/createtopology.sql \
+	$(topsrcdir)/topology/test/regress/droptopogeometrycolumn.sql \
+	$(topsrcdir)/topology/test/regress/droptopology.sql \
+	$(topsrcdir)/topology/test/regress/getedgebypoint.sql \
+	$(topsrcdir)/topology/test/regress/getfacebypoint.sql \
+	$(topsrcdir)/topology/test/regress/getnodebypoint.sql \
+	$(topsrcdir)/topology/test/regress/getringedges.sql \
+	$(topsrcdir)/topology/test/regress/gettopogeomelements.sql \
+	$(topsrcdir)/topology/test/regress/gml.sql \
+	$(topsrcdir)/topology/test/regress/layertrigger.sql \
+	$(topsrcdir)/topology/test/regress/legacy_invalid.sql \
+	$(topsrcdir)/topology/test/regress/legacy_predicate.sql \
+	$(topsrcdir)/topology/test/regress/legacy_query.sql \
+	$(topsrcdir)/topology/test/regress/legacy_validate.sql \
+	$(topsrcdir)/topology/test/regress/polygonize.sql \
+	$(topsrcdir)/topology/test/regress/sqlmm.sql \
+	$(topsrcdir)/topology/test/regress/st_addedgemodface.sql \
+	$(topsrcdir)/topology/test/regress/st_addedgenewfaces.sql \
+	$(topsrcdir)/topology/test/regress/st_addisoedge.sql \
+	$(topsrcdir)/topology/test/regress/st_addisonode.sql \
+	$(topsrcdir)/topology/test/regress/st_changeedgegeom.sql \
+	$(topsrcdir)/topology/test/regress/st_createtopogeo.sql \
+	$(topsrcdir)/topology/test/regress/st_getfaceedges.sql \
+	$(topsrcdir)/topology/test/regress/st_getfacegeometry.sql \
+	$(topsrcdir)/topology/test/regress/st_modedgeheal.sql \
+	$(topsrcdir)/topology/test/regress/st_modedgesplit.sql \
+	$(topsrcdir)/topology/test/regress/st_newedgeheal.sql \
+	$(topsrcdir)/topology/test/regress/st_newedgessplit.sql \
+	$(topsrcdir)/topology/test/regress/st_remedgemodface.sql \
+	$(topsrcdir)/topology/test/regress/st_remedgenewface.sql \
+	$(topsrcdir)/topology/test/regress/st_simplify.sql \
+	$(topsrcdir)/topology/test/regress/topo2.5d.sql \
+	$(topsrcdir)/topology/test/regress/topoelementarray_agg.sql \
+	$(topsrcdir)/topology/test/regress/topoelement.sql \
+	$(topsrcdir)/topology/test/regress/topogeo_addlinestring.sql \
+	$(topsrcdir)/topology/test/regress/topogeo_addpoint.sql \
+	$(topsrcdir)/topology/test/regress/topogeo_addpolygon.sql \
+  $(topsrcdir)/topology/test/regress/topogeom_edit.sql \
+	$(topsrcdir)/topology/test/regress/topogeometry_type.sql \
+	$(topsrcdir)/topology/test/regress/topojson.sql \
+  $(topsrcdir)/topology/test/regress/topologysummary.sql \
+	$(topsrcdir)/topology/test/regress/totopogeom.sql \
+	$(topsrcdir)/topology/test/regress/validatetopology.sql
+

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

Summary of changes:
 topology/test/Makefile.in | 61 +++++---------------------------------------
 topology/test/tests.mk    | 64 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 55 deletions(-)
 create mode 100644 topology/test/tests.mk


hooks/post-receive
-- 
PostGIS