Fix GEOS dependent expected results

Now tested and successful with all supported GEOS versions

git-svn-id: http://svn.osgeo.org/postgis/trunk@11584 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/topology/test/Makefile.in b/topology/test/Makefile.in
index 17a32d833029080657d796887ef54b459e5f5627..fe15e7af1cbc95b947915d5b483bb64241fd1c1e 100644 (file)
--- a/topology/test/Makefile.in
+++ b/topology/test/Makefile.in
@@ -48,7 +48,7 @@ TESTS = regress/legacy_validate.sql regress/legacy_predicate.sql \
        regress/st_simplify.sql \
        regress/topoelement.sql \
        regress/topoelementarray_agg.sql \
-       regress/topogeo_addlinestring \
+       regress/topogeo_addlinestring.sql \
        regress/topogeo_addpoint.sql \
        regress/topogeo_addpolygon.sql \
        regress/topogeometry_type.sql \
@@ -68,7 +68,9 @@ TESTS = regress/legacy_validate.sql regress/legacy_predicate.sql \
        regress/layertrigger.sql \
        regress/validatetopology.sql
 
-regress/topogeo_addlinestring: Makefile
+TESTS_EXPECTED = $(TESTS:.sql=_expected)
+
+regress/topogeo_addlinestring_expected: Makefile
 ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">=" 338),1)
        cp regress/topogeo_addlinestring_expected_newsnap regress/topogeo_addlinestring_expected
 else
@@ -76,7 +78,7 @@ else
 endif
        
 
-check: topo_predicates.sql load_topology.sql load_topology-4326.sql $(TESTS)
+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)
        $(PERL) ../../regress/run_test.pl --upgrade --topology $(RUNTESTFLAGS) $(TESTS)

diff --git a/topology/test/regress/topogeo_addlinestring_expected_oldsnap b/topology/test/regress/topogeo_addlinestring_expected_oldsnap
index 4d799644869762abd43f7445f3f01987da7e8454..ed427d6645273cccbc9870aea573e4fa54bd5cfb 100644 (file)
--- a/topology/test/regress/topogeo_addlinestring_expected_oldsnap
+++ b/topology/test/regress/topogeo_addlinestring_expected_oldsnap
@@ -171,7 +171,7 @@ E|70|sn70|en73
 E|71|sn73|en71
 E|72|sn72|en73
 #1714.1|N|74
-N|74||POINT(10 0)
+N|74|0|POINT(10 0)
 #1714.2|E*|73
 N|75||POINT(0 20)
 E|73|sn74|en75