[SCM] PostGIS branch stable-3.4 updated. 3.4.2-28-g2d4aed4ec
git at osgeo.org
git at osgeo.org
Thu Mar 28 07:28:47 PDT 2024
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, stable-3.4 has been updated
via 2d4aed4ec59f97525494459cb7b00a433ffddd98 (commit)
via bbd06a2c6fc8e538e9ab36ac13b892b250949f18 (commit)
via 0d08721e70ebb53b68fb754b2e377fc6d03e2601 (commit)
from abfd6a99a59d741cdce010b63e7b69505b15dfcd (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 2d4aed4ec59f97525494459cb7b00a433ffddd98
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Mar 28 12:44:16 2024 +0100
Fix check for enabled tests
References #5704 in 3.4 branch (3.4.3dev)
diff --git a/utils/check_tests_enabled.sh b/utils/check_tests_enabled.sh
index b8f69f83c..caaca5ceb 100755
--- a/utils/check_tests_enabled.sh
+++ b/utils/check_tests_enabled.sh
@@ -21,7 +21,7 @@ check_enabled() {
suffix=$2
bd=`dirname ${mk}`/${suffix}
- #cho "MK file: ${mk}"
+ #echo "MK file: ${mk}"
#echo "Suffix: ${suffix}"
#echo "Basedir: ${bd}"
@@ -32,15 +32,12 @@ check_enabled() {
#cat ${TMPDIR}/enabled_tests
- find ${bd} -name '*.sql' |
- grep -v '\-post.sql' | grep -v '\-pre.sql' |
- sed 's|\.select.sql$||' |
- sed 's|//|/|' |
- sed 's|\.sql$||' > ${TMPDIR}/available_tests
+ find ${bd} -name '*_expected' |
+ sed 's|_expected$||' > ${TMPDIR}/available_tests
#cat ${TMPDIR}/available_tests
- MISSING=`grep -vf ${TMPDIR}/enabled_tests ${TMPDIR}/available_tests`
+ MISSING=`grep -vwf ${TMPDIR}/enabled_tests ${TMPDIR}/available_tests`
if test -n "${MISSING}"; then
(
echo "The following tests are available but not enabled in:"
@@ -76,9 +73,18 @@ if [ -z "${RD}" ]; then
fi
cd ${RD}
-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.in &&
-check_enabled regress/core/tests.mk.in &&
+err=0
+check_enabled topology/test/tests.mk regress
+err=$(($err+$?))
+check_enabled regress/loader/tests.mk
+err=$(($err+$?))
+check_enabled regress/dumper/tests.mk
+err=$(($err+$?))
+check_enabled sfcgal/regress/tests.mk.in
+err=$(($err+$?))
+check_enabled regress/core/tests.mk.in
+err=$(($err+$?))
check_enabled raster/test/regress/tests.mk
+err=$(($err+$?))
+
+exit $err
commit bbd06a2c6fc8e538e9ab36ac13b892b250949f18
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Mar 28 12:45:53 2024 +0100
Enable accidentally disabled tests
These are:
- regress/core/geography_centroid
- regress/core/geography_covers
- topology/test/regress/validatetopologyrelation.sql
References #5704 in 3.4 branch (3.4.3dev)
diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index 3cd590e98..796b6fa0d 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -44,6 +44,8 @@ TESTS += \
$(top_srcdir)/regress/core/forcecurve \
$(top_srcdir)/regress/core/flatgeobuf \
$(top_srcdir)/regress/core/geography \
+ $(top_srcdir)/regress/core/geography_centroid \
+ $(top_srcdir)/regress/core/geography_covers \
$(top_srcdir)/regress/core/geometric_median \
$(top_srcdir)/regress/core/geos_noop \
$(top_srcdir)/regress/core/hausdorff \
diff --git a/topology/test/tests.mk b/topology/test/tests.mk
index 716fe291a..5c3f0e92e 100644
--- a/topology/test/tests.mk
+++ b/topology/test/tests.mk
@@ -83,4 +83,5 @@ TESTS += \
$(top_srcdir)/topology/test/regress/topologysummary.sql \
$(top_srcdir)/topology/test/regress/totopogeom.sql \
$(top_srcdir)/topology/test/regress/validatetopology.sql \
+ $(top_srcdir)/topology/test/regress/validatetopologyrelation.sql \
$(top_srcdir)/topology/test/regress/topoelement_cast.sql
commit 0d08721e70ebb53b68fb754b2e377fc6d03e2601
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Mar 28 15:08:17 2024 +0100
Make geography_centroid tests tolerant to subtle differences
Check up to 10 decimal digits in text form
The test otherwise fails with 3.13.0dev-CAPI-1.18.0
but was not running in CI
References #5704 in 3.4 branch (3.4.3dev)
diff --git a/regress/core/geography_centroid.sql b/regress/core/geography_centroid.sql
index 7e1edabbe..c8930d43b 100644
--- a/regress/core/geography_centroid.sql
+++ b/regress/core/geography_centroid.sql
@@ -23,7 +23,7 @@ SELECT c, ST_Centroid(g::geography) FROM
) AS u(c, g);
-- test supported geometry types
-SELECT c, ST_Centroid(g::geography) FROM
+SELECT c, ST_AsText(ST_Centroid(g::geography), 10) FROM
( VALUES
('geog_centroid_sup_pt', 'POINT (23 42)'),
('geog_centroid_sup_line', 'LINESTRING(-20 35, 8 46)'),
diff --git a/regress/core/geography_centroid_expected b/regress/core/geography_centroid_expected
index 90375538e..270eced12 100644
--- a/regress/core/geography_centroid_expected
+++ b/regress/core/geography_centroid_expected
@@ -6,8 +6,8 @@ geog_centroid_mpt_idl_3|0101000020E610000000000000007066C00000000000000000
geog_centroid_pt_self_1|0101000020E610000000000000000010400000000000002040
geog_centroid_pt_self_2|0101000020E61000000000000000002EC00000000000003040
geog_centroid_pt_self_3|0101000020E610000000000000000037C000000000000045C0
-geog_centroid_sup_pt|0101000020E610000000000000000037400000000000004540
-geog_centroid_sup_line|0101000020E6100000753A468ED7B21CC00371ADA1B0AC4440
-geog_centroid_sup_mline|0101000020E61000009809DA1111101440C8CB7BE13F784540
-geog_centroid_sup_poly|0101000020E610000032ABE2FEB2DB25407A5DAC8D5A574940
-geog_centroid_sup_mpoly|0101000020E6100000AA6CB8CF16543C40828564C8CE403940
+geog_centroid_sup_pt|POINT(23 42)
+geog_centroid_sup_line|POINT(-7.174650405 41.3491403672)
+geog_centroid_sup_mline|POINT(5.0156901159 42.9394494872)
+geog_centroid_sup_poly|POINT(10.9291000034 50.6824509708)
+geog_centroid_sup_mpoly|POINT(28.3284730745 25.2531552549)
-----------------------------------------------------------------------
Summary of changes:
regress/core/geography_centroid.sql | 2 +-
regress/core/geography_centroid_expected | 10 +++++-----
regress/core/tests.mk.in | 2 ++
topology/test/tests.mk | 1 +
utils/check_tests_enabled.sh | 30 ++++++++++++++++++------------
5 files changed, 27 insertions(+), 18 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list