[postgis-tickets] [SCM] PostGIS branch stable-2.4 updated. 2.4.9-17-g46346c247

[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, stable-2.4 has been updated
       via  46346c24709ecf71ff8f52167896baaadeb49a81 (commit)
      from  563b33453a5ee50c9192f16440526ff3621ee144 (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 46346c24709ecf71ff8f52167896baaadeb49a81
Author: Regina Obe <lr at pcorp.us>
Date:   Sun Apr 24 00:31:34 2022 -0400

    Try to fix Gitlab dislike of addlinestring_expected. Try 3

diff --git a/topology/test/Makefile.in b/topology/test/Makefile.in
index 6d64c68fd..57fe66695 100644
--- a/topology/test/Makefile.in
+++ b/topology/test/Makefile.in
@@ -75,17 +75,15 @@ TESTS = regress/legacy_validate.sql regress/legacy_predicate.sql \
 TESTS_EXPECTED = $(TESTS:.sql=_expected)
 
 regress/topogeo_addlinestring_expected: Makefile
-ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">" 30700),1)
-	cp regress/topogeo_addlinestring_expected_newsnap2 regress/topogeo_addlinestring_expected
+ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">" 30308),1)
+cp regress/topogeo_addlinestring_expected_newsnap regress/topogeo_addlinestring_expected
 else
-  ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">" 30308),1)
-		cp regress/topogeo_addlinestring_expected_newsnap regress/topogeo_addlinestring_expected
-	else
-		cp regress/topogeo_addlinestring_expected_oldsnap regress/topogeo_addlinestring_expected
+cp regress/topogeo_addlinestring_expected_oldsnap regress/topogeo_addlinestring_expected
 endif
+ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">" 30700),1)
+cp regress/topogeo_addlinestring_expected_newsnap2 regress/topogeo_addlinestring_expected
 endif
 
-
 check: 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)

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

Summary of changes:
 topology/test/Makefile.in | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
PostGIS