[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0rc1-91-gb0e380d
git at osgeo.org
git at osgeo.org
Thu Feb 18 03:47:16 PST 2021
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 b0e380d3c1c9945ca570ff0b930d3cf0c0ced973 (commit)
via d412e4215f9445947fbde566bdd4ba7a07874ca1 (commit)
via 67a2477245979c56001d2df1767c59d30ae25229 (commit)
via 0d0f997dfff576837d0a043a955ed30d51affa95 (commit)
via 80a031b4aeff275dc7f85cd289f3cd69851b987d (commit)
via c2c8f8f9a4e5ebb4884e356520d3c6e7c4c088bb (commit)
from 86df398fcfced629460c0f03f8fb6691da405b26 (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 b0e380d3c1c9945ca570ff0b930d3cf0c0ced973
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Feb 18 10:07:21 2021 +0100
Add check for all available tests to be enabled
Adds a new check_tests_enabled.sh utility script.
Adds a "check-tests-enabled" Makefile target using the script.
Tags "check-tests-enabled" target as a dependency of "check" target.
diff --git a/GNUmakefile.in b/GNUmakefile.in
index a59fbab..3f98403 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -41,7 +41,7 @@ clean-local:
# TODO: drop 'test' target..
test: check
-check: check-no-trailing-blanks check-unit check-regress docs-check check-news
+check: check-no-trailing-blanks check-unit check-regress docs-check check-news check-tests-enabled
staged-install: all
$(MAKE) -C regress staged-install
@@ -209,6 +209,9 @@ include regress/runtest.mk
check-regress: staged-install check-regress-deps
+check-tests-enabled:
+ utils/check_tests_enabled.sh
+
check-regress-deps:
ifeq (@TOPOLOGY@,topology)
$(MAKE) -C topology/test $@
diff --git a/utils/check_tests_enabled.sh b/utils/check_tests_enabled.sh
new file mode 100755
index 0000000..d29e46f
--- /dev/null
+++ b/utils/check_tests_enabled.sh
@@ -0,0 +1,55 @@
+
+#!/bin/sh
+
+usage() {
+ echo "Usage: $0"
+}
+
+TMPDIR=/tmp/postgis_check_tests_enabled_$$
+mkdir -p ${TMPDIR}
+
+cleanup() {
+ #echo "Things are in ${TMPDIR}"
+ rm -rf ${TMPDIR}
+}
+
+trap 'cleanup' EXIT
+
+# Usage: check_enabled <path-to-test.mk> [<subdir-containing-tests>]
+check_enabled() {
+ mk=$1
+ suffix=$2
+ bd=`dirname ${mk}`/${suffix}
+
+ #echo "MK file: ${mk}"
+ #echo "Suffix: ${suffix}"
+ #echo "Basedir: ${bd}"
+
+ grep 'topsrcdir)' ${mk} |
+ sed 's|.*topsrcdir)/||;s/ .*$//' |
+ sed 's|\\||' |
+ sed 's|\.sql\>||' > ${TMPDIR}/enabled_tests
+
+ find ${bd} -name '*.sql' |
+ sed 's|\.sql$||' > ${TMPDIR}/available_tests
+
+ MISSING=`grep -vf ${TMPDIR}/enabled_tests ${TMPDIR}/available_tests`
+ if test -n "${MISSING}"; then
+ (
+ echo "The following tests are available but not enabled in:"
+ echo "- ${mk}:"
+ echo "${MISSING}" | sed 's/^/ /'
+ ) >&2
+ return 1
+ else
+ echo "All tests enabled in ${mk}"
+ return 0
+ fi
+}
+
+check_enabled topology/test/tests.mk regress &&
+check_enabled regress/loader/tests.mk &&
+check_enabled regress/dumper/tests.mk &&
+check_enabled sfcgal/regress/tests.mk &&
+check_enabled regress/core/tests.mk.in &&
+check_enabled raster/test/regress/tests.mk
commit d412e4215f9445947fbde566bdd4ba7a07874ca1
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Feb 18 11:55:12 2021 +0100
Rewrite raster tests list in a simpler and machine readable way
diff --git a/raster/test/regress/tests.mk b/raster/test/regress/tests.mk
index 39fb529..2f33bb7 100644
--- a/raster/test/regress/tests.mk
+++ b/raster/test/regress/tests.mk
@@ -11,121 +11,121 @@
# **********************************************************************
RASTER_TEST_FIRST = \
- check_gdal \
- load_outdb
+ $(topsrcdir)/raster/test/regress/check_gdal \
+ $(topsrcdir)/raster/test/regress/load_outdb
RASTER_TEST_LAST = \
- clean
+ $(topsrcdir)/raster/test/regress/clean
RASTER_TEST_METADATA = \
- check_raster_columns \
- check_raster_overviews
+ $(topsrcdir)/raster/test/regress/check_raster_columns \
+ $(topsrcdir)/raster/test/regress/check_raster_overviews
RASTER_TEST_IO = \
- rt_io
+ $(topsrcdir)/raster/test/regress/rt_io
RASTER_TEST_BASIC_FUNC = \
- rt_bytea \
- rt_wkb \
- box3d \
- rt_addband \
- rt_band \
- rt_tile
+ $(topsrcdir)/raster/test/regress/rt_bytea \
+ $(topsrcdir)/raster/test/regress/rt_wkb \
+ $(topsrcdir)/raster/test/regress/box3d \
+ $(topsrcdir)/raster/test/regress/rt_addband \
+ $(topsrcdir)/raster/test/regress/rt_band \
+ $(topsrcdir)/raster/test/regress/rt_tile
RASTER_TEST_PROPS = \
- rt_dimensions \
- rt_scale \
- rt_pixelsize \
- rt_upperleft \
- rt_rotation \
- rt_georeference \
- rt_set_properties \
- rt_isempty \
- rt_hasnoband \
- rt_metadata \
- rt_rastertoworldcoord \
- rt_worldtorastercoord \
- rt_convexhull \
- rt_envelope
+ $(topsrcdir)/raster/test/regress/rt_dimensions \
+ $(topsrcdir)/raster/test/regress/rt_scale \
+ $(topsrcdir)/raster/test/regress/rt_pixelsize \
+ $(topsrcdir)/raster/test/regress/rt_upperleft \
+ $(topsrcdir)/raster/test/regress/rt_rotation \
+ $(topsrcdir)/raster/test/regress/rt_georeference \
+ $(topsrcdir)/raster/test/regress/rt_set_properties \
+ $(topsrcdir)/raster/test/regress/rt_isempty \
+ $(topsrcdir)/raster/test/regress/rt_hasnoband \
+ $(topsrcdir)/raster/test/regress/rt_metadata \
+ $(topsrcdir)/raster/test/regress/rt_rastertoworldcoord \
+ $(topsrcdir)/raster/test/regress/rt_worldtorastercoord \
+ $(topsrcdir)/raster/test/regress/rt_convexhull \
+ $(topsrcdir)/raster/test/regress/rt_envelope
RASTER_TEST_BANDPROPS = \
- rt_band_properties \
- rt_set_band_properties \
- rt_pixelaspolygons \
- rt_pixelaspoints \
- rt_pixelascentroids \
- rt_setvalues_array \
- rt_summarystats \
- rt_count \
- rt_histogram \
- rt_quantile \
- rt_valuecount \
- rt_valuepercent \
- rt_bandmetadata \
- rt_pixelvalue \
- rt_neighborhood \
- rt_nearestvalue \
- rt_pixelofvalue \
- rt_polygon \
- rt_setbandpath
+ $(topsrcdir)/raster/test/regress/rt_band_properties \
+ $(topsrcdir)/raster/test/regress/rt_set_band_properties \
+ $(topsrcdir)/raster/test/regress/rt_pixelaspolygons \
+ $(topsrcdir)/raster/test/regress/rt_pixelaspoints \
+ $(topsrcdir)/raster/test/regress/rt_pixelascentroids \
+ $(topsrcdir)/raster/test/regress/rt_setvalues_array \
+ $(topsrcdir)/raster/test/regress/rt_summarystats \
+ $(topsrcdir)/raster/test/regress/rt_count \
+ $(topsrcdir)/raster/test/regress/rt_histogram \
+ $(topsrcdir)/raster/test/regress/rt_quantile \
+ $(topsrcdir)/raster/test/regress/rt_valuecount \
+ $(topsrcdir)/raster/test/regress/rt_valuepercent \
+ $(topsrcdir)/raster/test/regress/rt_bandmetadata \
+ $(topsrcdir)/raster/test/regress/rt_pixelvalue \
+ $(topsrcdir)/raster/test/regress/rt_neighborhood \
+ $(topsrcdir)/raster/test/regress/rt_nearestvalue \
+ $(topsrcdir)/raster/test/regress/rt_pixelofvalue \
+ $(topsrcdir)/raster/test/regress/rt_polygon \
+ $(topsrcdir)/raster/test/regress/rt_setbandpath
RASTER_TEST_UTILITY = \
- rt_utility \
- rt_fromgdalraster \
- rt_asgdalraster \
- rt_astiff \
- rt_asjpeg \
- rt_aspng \
- rt_reclass \
- rt_gdalwarp \
- rt_asraster \
- rt_dumpvalues \
- rt_makeemptycoverage \
- rt_createoverview
+ $(topsrcdir)/raster/test/regress/rt_utility \
+ $(topsrcdir)/raster/test/regress/rt_fromgdalraster \
+ $(topsrcdir)/raster/test/regress/rt_asgdalraster \
+ $(topsrcdir)/raster/test/regress/rt_astiff \
+ $(topsrcdir)/raster/test/regress/rt_asjpeg \
+ $(topsrcdir)/raster/test/regress/rt_aspng \
+ $(topsrcdir)/raster/test/regress/rt_reclass \
+ $(topsrcdir)/raster/test/regress/rt_gdalwarp \
+ $(topsrcdir)/raster/test/regress/rt_asraster \
+ $(topsrcdir)/raster/test/regress/rt_dumpvalues \
+ $(topsrcdir)/raster/test/regress/rt_makeemptycoverage \
+ $(topsrcdir)/raster/test/regress/rt_createoverview
RASTER_TEST_MAPALGEBRA = \
- rt_mapalgebraexpr \
- rt_mapalgebrafct \
- rt_mapalgebraexpr_2raster \
- rt_mapalgebrafct_2raster \
- rt_mapalgebrafctngb \
- rt_mapalgebrafctngb_userfunc \
- rt_intersection \
- rt_clip \
- rt_mapalgebra \
- rt_mapalgebra_expr \
- rt_mapalgebra_mask \
- rt_union \
- rt_invdistweight4ma \
- rt_4ma \
- rt_setvalues_geomval \
- rt_elevation_functions \
- rt_colormap \
- rt_grayscale
+ $(topsrcdir)/raster/test/regress/rt_mapalgebraexpr \
+ $(topsrcdir)/raster/test/regress/rt_mapalgebrafct \
+ $(topsrcdir)/raster/test/regress/rt_mapalgebraexpr_2raster \
+ $(topsrcdir)/raster/test/regress/rt_mapalgebrafct_2raster \
+ $(topsrcdir)/raster/test/regress/rt_mapalgebrafctngb \
+ $(topsrcdir)/raster/test/regress/rt_mapalgebrafctngb_userfunc \
+ $(topsrcdir)/raster/test/regress/rt_intersection \
+ $(topsrcdir)/raster/test/regress/rt_clip \
+ $(topsrcdir)/raster/test/regress/rt_mapalgebra \
+ $(topsrcdir)/raster/test/regress/rt_mapalgebra_expr \
+ $(topsrcdir)/raster/test/regress/rt_mapalgebra_mask \
+ $(topsrcdir)/raster/test/regress/rt_union \
+ $(topsrcdir)/raster/test/regress/rt_invdistweight4ma \
+ $(topsrcdir)/raster/test/regress/rt_4ma \
+ $(topsrcdir)/raster/test/regress/rt_setvalues_geomval \
+ $(topsrcdir)/raster/test/regress/rt_elevation_functions \
+ $(topsrcdir)/raster/test/regress/rt_colormap \
+ $(topsrcdir)/raster/test/regress/rt_grayscale
RASTER_TEST_SREL = \
- rt_gist_relationships \
- rt_intersects \
- rt_samealignment \
- rt_geos_relationships \
- rt_iscoveragetile
+ $(topsrcdir)/raster/test/regress/rt_gist_relationships \
+ $(topsrcdir)/raster/test/regress/rt_intersects \
+ $(topsrcdir)/raster/test/regress/rt_samealignment \
+ $(topsrcdir)/raster/test/regress/rt_geos_relationships \
+ $(topsrcdir)/raster/test/regress/rt_iscoveragetile
RASTER_TEST_BUGS = \
- bug_test_car5 \
- permitted_gdal_drivers \
- tickets
+ $(topsrcdir)/raster/test/regress/bug_test_car5 \
+ $(topsrcdir)/raster/test/regress/permitted_gdal_drivers \
+ $(topsrcdir)/raster/test/regress/tickets
RASTER_TEST_LOADER = \
- loader/Basic \
- loader/Projected \
- loader/BasicCopy \
- loader/BasicFilename \
- loader/BasicOutDB \
- loader/Tiled10x10 \
- loader/Tiled10x10Copy \
- loader/Tiled8x8 \
- loader/TiledAuto \
- loader/TiledAutoSkipNoData
+ $(topsrcdir)/raster/test/regress/loader/Basic \
+ $(topsrcdir)/raster/test/regress/loader/Projected \
+ $(topsrcdir)/raster/test/regress/loader/BasicCopy \
+ $(topsrcdir)/raster/test/regress/loader/BasicFilename \
+ $(topsrcdir)/raster/test/regress/loader/BasicOutDB \
+ $(topsrcdir)/raster/test/regress/loader/Tiled10x10 \
+ $(topsrcdir)/raster/test/regress/loader/Tiled10x10Copy \
+ $(topsrcdir)/raster/test/regress/loader/Tiled8x8 \
+ $(topsrcdir)/raster/test/regress/loader/TiledAuto \
+ $(topsrcdir)/raster/test/regress/loader/TiledAutoSkipNoData
RASTER_TESTS := $(RASTER_TEST_FIRST) \
$(RASTER_TEST_METADATA) $(RASTER_TEST_IO) $(RASTER_TEST_BASIC_FUNC) \
@@ -135,4 +135,4 @@ RASTER_TESTS := $(RASTER_TEST_FIRST) \
$(RASTER_TEST_LOADER) \
$(RASTER_TEST_LAST)
-TESTS += $(patsubst %, $(topsrcdir)/raster/test/regress/%, $(RASTER_TESTS))
+TESTS += $(RASTER_TESTS)
commit 67a2477245979c56001d2df1767c59d30ae25229
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Feb 18 11:54:47 2021 +0100
Enable geos_noop and wrapx core tests
diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index db0e5c2..a0f50df 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -38,6 +38,7 @@ TESTS += \
$(topsrcdir)/regress/core/forcecurve \
$(topsrcdir)/regress/core/geography \
$(topsrcdir)/regress/core/geometric_median \
+ $(topsrcdir)/regress/core/geos_noop \
$(topsrcdir)/regress/core/hausdorff \
$(topsrcdir)/regress/core/in_geohash \
$(topsrcdir)/regress/core/in_gml \
@@ -117,7 +118,8 @@ TESTS += \
$(topsrcdir)/regress/core/minimum_clearance \
$(topsrcdir)/regress/core/oriented_envelope \
$(topsrcdir)/regress/core/point_coordinates \
- $(topsrcdir)/regress/core/out_geojson
+ $(topsrcdir)/regress/core/out_geojson \
+ $(topsrcdir)/regress/core/wrapx
# Slow slow tests
TESTS_SLOW = \
commit 0d0f997dfff576837d0a043a955ed30d51affa95
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Feb 18 10:24:00 2021 +0100
Enable getnodeedges topology test
And fix expectations from it
diff --git a/topology/test/regress/getnodeedges_expected b/topology/test/regress/getnodeedges_expected
index 3bd2a10..ade79a0 100644
--- a/topology/test/regress/getnodeedges_expected
+++ b/topology/test/regress/getnodeedges_expected
@@ -1,9 +1,7 @@
-BEGIN
t
9
22
26
-COMMIT
N1|1|1
N1|2|-1
N2|1|3
diff --git a/topology/test/tests.mk b/topology/test/tests.mk
index 9ee5e63..fa4025f 100644
--- a/topology/test/tests.mk
+++ b/topology/test/tests.mk
@@ -26,6 +26,7 @@ TESTS += \
$(topsrcdir)/topology/test/regress/getedgebypoint.sql \
$(topsrcdir)/topology/test/regress/getfacebypoint.sql \
$(topsrcdir)/topology/test/regress/getnodebypoint.sql \
+ $(topsrcdir)/topology/test/regress/getnodeedges.sql \
$(topsrcdir)/topology/test/regress/getringedges.sql \
$(topsrcdir)/topology/test/regress/gettopogeomelements.sql \
$(topsrcdir)/topology/test/regress/gml.sql \
commit 80a031b4aeff275dc7f85cd289f3cd69851b987d
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Feb 18 10:23:13 2021 +0100
Enable cleartopogeom topology test
And fix it to play nicely with other tests
diff --git a/topology/test/regress/cleartopogeom.sql b/topology/test/regress/cleartopogeom.sql
index 6f27f76..e8d8c57 100644
--- a/topology/test/regress/cleartopogeom.sql
+++ b/topology/test/regress/cleartopogeom.sql
@@ -33,4 +33,5 @@ SELECT 'relation after', count(distinct topogeo_id)
FROM city_data.relation
WHERE layer_id = 1;
-select droptopology('city_data');
+select NULL FROM droptopology('city_data');
+DROP SCHEMA features CASCADE;
diff --git a/topology/test/regress/cleartopogeom_expected b/topology/test/regress/cleartopogeom_expected
index decc772..741f3ec 100644
--- a/topology/test/regress/cleartopogeom_expected
+++ b/topology/test/regress/cleartopogeom_expected
@@ -1,17 +1,12 @@
-BEGIN
t
9
22
26
-COMMIT
-BEGIN
1
2
3
-COMMIT
relation before|5
feature before|P1|f
feature during|P1|t
feature after|P1|t
relation after|4
-Topology 'city_data' dropped
diff --git a/topology/test/tests.mk b/topology/test/tests.mk
index bdecb99..9ee5e63 100644
--- a/topology/test/tests.mk
+++ b/topology/test/tests.mk
@@ -17,6 +17,7 @@ TESTS += \
$(topsrcdir)/topology/test/regress/addnode.sql \
$(topsrcdir)/topology/test/regress/addtopogeometrycolumn.sql \
$(topsrcdir)/topology/test/regress/copytopology.sql \
+ $(topsrcdir)/topology/test/regress/cleartopogeom.sql \
$(topsrcdir)/topology/test/regress/createtopogeom.sql \
$(topsrcdir)/topology/test/regress/createtopology.sql \
$(topsrcdir)/topology/test/regress/droptopogeometrycolumn.sql \
commit c2c8f8f9a4e5ebb4884e356520d3c6e7c4c088bb
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Feb 18 09:52:31 2021 +0100
Enable the findtopology topology test
diff --git a/topology/test/tests.mk b/topology/test/tests.mk
index f46097a..bdecb99 100644
--- a/topology/test/tests.mk
+++ b/topology/test/tests.mk
@@ -21,6 +21,7 @@ TESTS += \
$(topsrcdir)/topology/test/regress/createtopology.sql \
$(topsrcdir)/topology/test/regress/droptopogeometrycolumn.sql \
$(topsrcdir)/topology/test/regress/droptopology.sql \
+ $(topsrcdir)/topology/test/regress/findtopology.sql \
$(topsrcdir)/topology/test/regress/getedgebypoint.sql \
$(topsrcdir)/topology/test/regress/getfacebypoint.sql \
$(topsrcdir)/topology/test/regress/getnodebypoint.sql \
-----------------------------------------------------------------------
Summary of changes:
GNUmakefile.in | 5 +-
raster/test/regress/tests.mk | 188 +++++++++++++--------------
regress/core/tests.mk.in | 4 +-
topology/test/regress/cleartopogeom.sql | 3 +-
topology/test/regress/cleartopogeom_expected | 5 -
topology/test/regress/getnodeedges_expected | 2 -
topology/test/tests.mk | 3 +
utils/check_tests_enabled.sh | 55 ++++++++
8 files changed, 161 insertions(+), 104 deletions(-)
create mode 100755 utils/check_tests_enabled.sh
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list