[SCM] PostGIS branch master updated. 3.4.0rc1-1075-g94437b681

git at osgeo.org git at osgeo.org
Thu Mar 28 07:15:39 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, master has been updated
       via  94437b68118a4cbee3a9b86e73c2b2971285aa6f (commit)
       via  b0698d29f76e10e76f1992905ad62dbda368c17e (commit)
       via  fd6071472a50c71af83f424e1effdd0ffd69c95a (commit)
       via  6e3f86d4ee82c4c16f80da97ad2c39b95be8daf4 (commit)
      from  ff91a5acd205638bf6230c02391048883e0a4a35 (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 94437b68118a4cbee3a9b86e73c2b2971285aa6f
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Mar 28 12:44:16 2024 +0100

    Fix check for enabled tests
    
    References #5704 in master branch (3.5.0dev)

diff --git a/utils/check_tests_enabled.sh b/utils/check_tests_enabled.sh
index bd186f8da..393c68355 100755
--- a/utils/check_tests_enabled.sh
+++ b/utils/check_tests_enabled.sh
@@ -20,7 +20,7 @@ check_enabled() {
   suffix=$2
   bd=`dirname ${mk}`/${suffix}
 
-  #cho "MK file: ${mk}"
+  #echo "MK file: ${mk}"
   #echo "Suffix: ${suffix}"
   #echo "Basedir: ${bd}"
 
@@ -31,15 +31,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:"

commit b0698d29f76e10e76f1992905ad62dbda368c17e
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 master branch (3.5.0dev)

diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index dca602a6a..7e783d7b5 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -46,6 +46,8 @@ TESTS += \
 	$(top_srcdir)/regress/core/frechet \
 	$(top_srcdir)/regress/core/generate_points \
 	$(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/geos38 \
diff --git a/topology/test/tests.mk b/topology/test/tests.mk
index 5f148a6ca..02edc26fc 100644
--- a/topology/test/tests.mk
+++ b/topology/test/tests.mk
@@ -84,4 +84,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 fd6071472a50c71af83f424e1effdd0ffd69c95a
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 master branch (3.5.0dev)

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)

commit 6e3f86d4ee82c4c16f80da97ad2c39b95be8daf4
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Mar 28 15:03:19 2024 +0100

    Fix geography_covers test syntax
    
    It was broken by 51ff306d3f32217d00e9511cfe9463ddb0523adb
    but the test was not running in CI
    
    References #5704 in master branch (3.5.0dev)

diff --git a/regress/core/geography_covers.sql b/regress/core/geography_covers.sql
index 721f2431a..4cc413622 100644
--- a/regress/core/geography_covers.sql
+++ b/regress/core/geography_covers.sql
@@ -41,7 +41,7 @@ SELECT c, ST_Covers(g::geography, g::geography) FROM
     ('geog_covers_self_point', 'POINT (0 20)'),
     ('geog_covers_self_line', 'LINESTRING (35 35, 35 15, 15 15)'),
     ('geog_covers_self_polygon', 'POLYGON((0 40, 40 40, 40 0, 0 0, 0 40))')
-) AS u(c, g)
+) AS u(c, g);
 
 -- donut covers
 SELECT 'geog_covers_donut', ST_Covers(

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

Summary of changes:
 regress/core/geography_centroid.sql      |  2 +-
 regress/core/geography_centroid_expected | 10 +++++-----
 regress/core/geography_covers.sql        |  2 +-
 regress/core/tests.mk.in                 |  2 ++
 topology/test/tests.mk                   |  1 +
 utils/check_tests_enabled.sh             | 11 ++++-------
 6 files changed, 14 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list