[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-711-g5bb5a91c8

[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  5bb5a91c807cfc85a3b50c577dfbaf8950fa17db (commit)
      from  9f249630ecf9723b043ec76d151b3b24464ffb1b (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 5bb5a91c807cfc85a3b50c577dfbaf8950fa17db
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Apr 11 14:51:35 2022 -0700

    Alter check_tests_enabled.sh to also work on MacOS

diff --git a/topology/test/tests.mk b/topology/test/tests.mk
index c709e81f3..8f28e38f7 100644
--- a/topology/test/tests.mk
+++ b/topology/test/tests.mk
@@ -18,9 +18,9 @@ override RUNTESTFLAGS_INTERNAL := \
   --after-upgrade-script $(topsrcdir)/topology/test/regress/hooks/hook-after-upgrade-topology.sql
 
 TESTS += \
-  $(topsrcdir)/topology/test/regress/addedge.sql \
+	$(topsrcdir)/topology/test/regress/addedge.sql \
 	$(topsrcdir)/topology/test/regress/addface2.5d.sql \
-  $(topsrcdir)/topology/test/regress/addface.sql \
+	$(topsrcdir)/topology/test/regress/addface.sql \
 	$(topsrcdir)/topology/test/regress/addnode.sql \
 	$(topsrcdir)/topology/test/regress/addtopogeometrycolumn.sql \
 	$(topsrcdir)/topology/test/regress/cleartopogeom.sql \
diff --git a/utils/check_tests_enabled.sh b/utils/check_tests_enabled.sh
index 1e518b44e..d14ec4fb0 100755
--- a/utils/check_tests_enabled.sh
+++ b/utils/check_tests_enabled.sh
@@ -21,18 +21,25 @@ check_enabled() {
   suffix=$2
   bd=`dirname ${mk}`/${suffix}
 
-  #echo "MK file: ${mk}"
+  #cho "MK file: ${mk}"
   #echo "Suffix: ${suffix}"
   #echo "Basedir: ${bd}"
 
   grep 'topsrcdir)' ${mk} |
       sed 's|.*topsrcdir)/||;s/ .*$//' |
       sed 's|\\||' |
-      sed 's|\.sql\>||' > ${TMPDIR}/enabled_tests
+      sed 's/\.sql$//' > ${TMPDIR}/enabled_tests
+
+  #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
 
+  #cat ${TMPDIR}/available_tests
+
   MISSING=`grep -vf ${TMPDIR}/enabled_tests ${TMPDIR}/available_tests`
   if test -n "${MISSING}"; then
     (
@@ -69,7 +76,7 @@ if [ -z "${RD}" ]; then
 fi
 
 cd ${RD}
-check_enabled topology/test/tests.mk regress &&
+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 &&

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

Summary of changes:
 topology/test/tests.mk       |  4 ++--
 utils/check_tests_enabled.sh | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS