[postgis-tickets] r16023 - Drop handling of tests for GEOS < 3.3.8

Sandro Santilli strk at kbt.io
Fri Oct 20 11:22:38 PDT 2017 

Author: strk
Date: 2017-10-20 11:22:38 -0700 (Fri, 20 Oct 2017)
New Revision: 16023

Added:
   trunk/topology/test/regress/topogeo_addlinestring_expected
Removed:
   trunk/topology/test/regress/topogeo_addlinestring_expected_newsnap
   trunk/topology/test/regress/topogeo_addlinestring_expected_oldsnap
Modified:
   trunk/topology/test/Makefile.in
Log:
Drop handling of tests for GEOS < 3.3.8

As we required 3.4.0+ already, at least since PostGIS 2.4.0

Modified: trunk/topology/test/Makefile.in
===================================================================
--- trunk/topology/test/Makefile.in	2017-10-20 15:28:05 UTC (rev 16022)
+++ trunk/topology/test/Makefile.in	2017-10-20 18:22:38 UTC (rev 16023)
@@ -4,7 +4,7 @@
 PERL=@PERL@
 GEOS_NUMERIC_VERSION=@GEOS_NUMERIC_VERSION@
 
-all: 
+all:
 	@echo "Use 'make check' to run all tests"
 
 # TODO: make edit_topology.sql into a proper test
@@ -22,7 +22,7 @@
 	@cpp -P -traditional-cpp load_topology.sql.in | sed -e 's:@SRID@:4326:g' > load_topology-4326.sql
 
 clean distclean:
-	rm -f topo_predicates.sql load_topology.sql load_topology-4326.sql regress/topogeo_addlinestring_expected
+	rm -f topo_predicates.sql load_topology.sql load_topology-4326.sql
 
 TESTS = regress/legacy_validate.sql regress/legacy_predicate.sql \
 	regress/legacy_invalid.sql regress/sqlmm.sql \
@@ -73,14 +73,6 @@
 
 TESTS_EXPECTED = $(TESTS:.sql=_expected)
 
-regress/topogeo_addlinestring_expected: Makefile
-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
-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)

Copied: trunk/topology/test/regress/topogeo_addlinestring_expected (from rev 16022, trunk/topology/test/regress/topogeo_addlinestring_expected_newsnap)
===================================================================
--- trunk/topology/test/regress/topogeo_addlinestring_expected	                        (rev 0)
+++ trunk/topology/test/regress/topogeo_addlinestring_expected	2017-10-20 18:22:38 UTC (rev 16023)
@@ -0,0 +1,208 @@
+BEGIN
+t
+9
+22
+26
+COMMIT
+max|node|22
+max|edge|26
+ERROR:  Invalid geometry type (MULTILINESTRING) passed to TopoGeo_AddLinestring, expected LINESTRING
+ERROR:  Invalid geometry type (POINT) passed to TopoGeo_AddLinestring, expected LINESTRING
+ERROR:  No topology with name "invalid" in topology.topology
+iso_uni|27
+N|23||POINT(36 26)
+N|24||POINT(38 30)
+E|27|sn23|en24
+iso_f5|28
+N|25||POINT(37 20)
+N|26||POINT(41 16)
+E|28|sn25|en26
+iso_ex|27
+iso_ex_tol|27
+noniso_ex|18
+noniso_ex_tol|18
+contained|29
+N|27||POINT(35 8)
+N|28||POINT(35 12)
+E|18|sn10|en27
+E|29|sn27|en28
+E|30|sn28|en13
+overlap|31
+overlap|32
+N|29||POINT(49 22)
+N|30||POINT(45 22)
+E|8|sn18|en30
+E|31|sn19|en29
+E|32|sn30|en19
+cross|34
+cross|35
+N|31||POINT(49 18)
+N|32||POINT(47 17.6)
+N|33||POINT(44 17)
+E|15|sn12|en32
+E|33|sn32|en19
+E|34|sn31|en32
+E|35|sn32|en33
+snap|7
+snap|36
+snap|39
+N|34||POINT(18 22)
+N|35||POINT(22.4 22)
+N|36||POINT(21 20.4)
+E|6|sn16|en34
+E|7|sn17|en35
+E|19|sn14|en36
+E|36|sn34|en17
+E|37|sn35|en18
+E|38|sn36|en17
+E|39|sn35|en36
+snap_again|7
+snap_again|36
+snap_again|39
+crossover|42
+crossover|44
+crossover|45
+crossover|46
+N|37||POINT(9 20)
+N|38||POINT(16.2 14)
+N|39||POINT(21 10)
+N|40||POINT(9 18)
+N|41||POINT(21 7)
+E|9|sn15|en38
+E|20|sn9|en41
+E|21|sn15|en40
+E|40|sn37|en16
+E|41|sn38|en14
+E|42|sn37|en38
+E|43|sn39|en14
+E|44|sn38|en39
+E|45|sn40|en37
+E|46|sn41|en39
+crossover_again|42
+crossover_again|44
+crossover_again|45
+crossover_again|46
+contains|25
+contains|47
+contains|48
+N|42||POINT(7 36)
+N|43||POINT(14 34)
+E|47|sn21|en42
+E|48|sn43|en22
+nodecross|49
+nodecross|50
+N|44||POINT(18 37)
+N|45||POINT(22 37)
+E|49|sn44|en4
+E|50|sn4|en45
+iso_ex_2segs|28
+#1613.1|51
+N|46||POINT(556267.6 144887)
+N|47||POINT(556267 144887.4)
+E|51|sn46|en47
+#1613.2|53
+#1613.2|54
+N|48||POINT(556250 144887)
+N|49||POINT(556267.6 144887)
+N|50||POINT(556310 144887)
+E|51|sn46|en49
+E|52|sn49|en47
+E|53|sn48|en49
+E|54|sn49|en50
+#1631.1|55
+N|51||POINT(556267.6 144887)
+N|52||POINT(556267.6 144888)
+E|55|sn51|en52
+#1631.2|56
+#1631.2|57
+N|53||POINT(556254.6 144886.6)
+N|54||POINT(556267.6 144887)
+E|56|sn53|en51
+E|57|sn51|en54
+#1641.1|58
+N|55||POINT(-0.2 0.4)
+N|56||POINT(0.2 0.4)
+E|58|sn55|en56
+#1641.2|60
+#1641.2|61
+N|57||POINT(0 0.2)
+N|58||POINT(0 0.4)
+N|59||POINT(0 0.4)
+E|58|sn55|en58
+E|59|sn58|en56
+E|60|sn57|en58
+E|61|sn58|en59
+#1641.3|62
+N|60||POINT(-0.2 0.4)
+N|61||POINT(0.2 0.4)
+E|62|sn60|en61
+#1641.4|64
+#1641.4|65
+N|62||POINT(0 0.2)
+N|63||POINT(0 0.4)
+N|64||POINT(0 0.4)
+E|62|sn60|en63
+E|63|sn63|en61
+E|64|sn62|en63
+E|65|sn63|en64
+#1650.1
+N|65|0|POINT(0 0)
+#1650.3|66
+N|66||POINT(10 0)
+E|66|sn65|en66
+#1654.1|N|67
+N|67|0|POINT(0 0)
+#1654.2|67
+#1654.2|68
+N|68||POINT(-10 1)
+N|69||POINT(10 1)
+E|67|sn68|en67
+E|68|sn67|en69
+#1706.1|E|69
+N|70||POINT(20 10)
+N|71||POINT(10 20)
+E|69|sn70|en71
+#1706.2|E*|69
+#1706.2|E*|71
+#1706.2|E*|72
+N|72||POINT(10 0)
+N|73||POINT(10 10)
+N|74||POINT(15 10)
+E|69|sn70|en74
+E|70|sn73|en71
+E|71|sn72|en73
+E|72|sn74|en73
+#1714.1|N|75
+N|75|0|POINT(10 0)
+#1714.2|E*|73
+N|76||POINT(0 20)
+E|73|sn75|en76
+Topology 'city_data' dropped
+t3280.start|t
+t3280|L11
+t3280|L22
+t3280|L1b4
+t3280|L1b2
+t3280.end|Topology 'bug3280' dropped
+t3380.start|t
+t3380.L1|1
+t3380.L2|3
+t3380.L2|4
+t3380.L3|5
+t3380.end|Topology 'bug3380' dropped
+t3402.start|t
+t3402.L1|1
+t3402.L2|3
+t3402.end|Topology 'bug3402' dropped
+t3412.start|t
+t3412.L1|1
+t3412.L2|2
+t3412.L2|3
+t3412.L2|5
+t3412.L2|4
+t3412.end|Topology 'bug3412' dropped
+t3371.start|t
+t3371.L1|1
+t3371.L2|3
+t3371.L2|2
+t3371.end|Topology 'bug3711' dropped

Deleted: trunk/topology/test/regress/topogeo_addlinestring_expected_newsnap
===================================================================
--- trunk/topology/test/regress/topogeo_addlinestring_expected_newsnap	2017-10-20 15:28:05 UTC (rev 16022)
+++ trunk/topology/test/regress/topogeo_addlinestring_expected_newsnap	2017-10-20 18:22:38 UTC (rev 16023)
@@ -1,208 +0,0 @@
-BEGIN
-t
-9
-22
-26
-COMMIT
-max|node|22
-max|edge|26
-ERROR:  Invalid geometry type (MULTILINESTRING) passed to TopoGeo_AddLinestring, expected LINESTRING
-ERROR:  Invalid geometry type (POINT) passed to TopoGeo_AddLinestring, expected LINESTRING
-ERROR:  No topology with name "invalid" in topology.topology
-iso_uni|27
-N|23||POINT(36 26)
-N|24||POINT(38 30)
-E|27|sn23|en24
-iso_f5|28
-N|25||POINT(37 20)
-N|26||POINT(41 16)
-E|28|sn25|en26
-iso_ex|27
-iso_ex_tol|27
-noniso_ex|18
-noniso_ex_tol|18
-contained|29
-N|27||POINT(35 8)
-N|28||POINT(35 12)
-E|18|sn10|en27
-E|29|sn27|en28
-E|30|sn28|en13
-overlap|31
-overlap|32
-N|29||POINT(49 22)
-N|30||POINT(45 22)
-E|8|sn18|en30
-E|31|sn19|en29
-E|32|sn30|en19
-cross|34
-cross|35
-N|31||POINT(49 18)
-N|32||POINT(47 17.6)
-N|33||POINT(44 17)
-E|15|sn12|en32
-E|33|sn32|en19
-E|34|sn31|en32
-E|35|sn32|en33
-snap|7
-snap|36
-snap|39
-N|34||POINT(18 22)
-N|35||POINT(22.4 22)
-N|36||POINT(21 20.4)
-E|6|sn16|en34
-E|7|sn17|en35
-E|19|sn14|en36
-E|36|sn34|en17
-E|37|sn35|en18
-E|38|sn36|en17
-E|39|sn35|en36
-snap_again|7
-snap_again|36
-snap_again|39
-crossover|42
-crossover|44
-crossover|45
-crossover|46
-N|37||POINT(9 20)
-N|38||POINT(16.2 14)
-N|39||POINT(21 10)
-N|40||POINT(9 18)
-N|41||POINT(21 7)
-E|9|sn15|en38
-E|20|sn9|en41
-E|21|sn15|en40
-E|40|sn37|en16
-E|41|sn38|en14
-E|42|sn37|en38
-E|43|sn39|en14
-E|44|sn38|en39
-E|45|sn40|en37
-E|46|sn41|en39
-crossover_again|42
-crossover_again|44
-crossover_again|45
-crossover_again|46
-contains|25
-contains|47
-contains|48
-N|42||POINT(7 36)
-N|43||POINT(14 34)
-E|47|sn21|en42
-E|48|sn43|en22
-nodecross|49
-nodecross|50
-N|44||POINT(18 37)
-N|45||POINT(22 37)
-E|49|sn44|en4
-E|50|sn4|en45
-iso_ex_2segs|28
-#1613.1|51
-N|46||POINT(556267.6 144887)
-N|47||POINT(556267 144887.4)
-E|51|sn46|en47
-#1613.2|53
-#1613.2|54
-N|48||POINT(556250 144887)
-N|49||POINT(556267.6 144887)
-N|50||POINT(556310 144887)
-E|51|sn46|en49
-E|52|sn49|en47
-E|53|sn48|en49
-E|54|sn49|en50
-#1631.1|55
-N|51||POINT(556267.6 144887)
-N|52||POINT(556267.6 144888)
-E|55|sn51|en52
-#1631.2|56
-#1631.2|57
-N|53||POINT(556254.6 144886.6)
-N|54||POINT(556267.6 144887)
-E|56|sn53|en51
-E|57|sn51|en54
-#1641.1|58
-N|55||POINT(-0.2 0.4)
-N|56||POINT(0.2 0.4)
-E|58|sn55|en56
-#1641.2|60
-#1641.2|61
-N|57||POINT(0 0.2)
-N|58||POINT(0 0.4)
-N|59||POINT(0 0.4)
-E|58|sn55|en58
-E|59|sn58|en56
-E|60|sn57|en58
-E|61|sn58|en59
-#1641.3|62
-N|60||POINT(-0.2 0.4)
-N|61||POINT(0.2 0.4)
-E|62|sn60|en61
-#1641.4|64
-#1641.4|65
-N|62||POINT(0 0.2)
-N|63||POINT(0 0.4)
-N|64||POINT(0 0.4)
-E|62|sn60|en63
-E|63|sn63|en61
-E|64|sn62|en63
-E|65|sn63|en64
-#1650.1
-N|65|0|POINT(0 0)
-#1650.3|66
-N|66||POINT(10 0)
-E|66|sn65|en66
-#1654.1|N|67
-N|67|0|POINT(0 0)
-#1654.2|67
-#1654.2|68
-N|68||POINT(-10 1)
-N|69||POINT(10 1)
-E|67|sn68|en67
-E|68|sn67|en69
-#1706.1|E|69
-N|70||POINT(20 10)
-N|71||POINT(10 20)
-E|69|sn70|en71
-#1706.2|E*|69
-#1706.2|E*|71
-#1706.2|E*|72
-N|72||POINT(10 0)
-N|73||POINT(10 10)
-N|74||POINT(15 10)
-E|69|sn70|en74
-E|70|sn73|en71
-E|71|sn72|en73
-E|72|sn74|en73
-#1714.1|N|75
-N|75|0|POINT(10 0)
-#1714.2|E*|73
-N|76||POINT(0 20)
-E|73|sn75|en76
-Topology 'city_data' dropped
-t3280.start|t
-t3280|L11
-t3280|L22
-t3280|L1b4
-t3280|L1b2
-t3280.end|Topology 'bug3280' dropped
-t3380.start|t
-t3380.L1|1
-t3380.L2|3
-t3380.L2|4
-t3380.L3|5
-t3380.end|Topology 'bug3380' dropped
-t3402.start|t
-t3402.L1|1
-t3402.L2|3
-t3402.end|Topology 'bug3402' dropped
-t3412.start|t
-t3412.L1|1
-t3412.L2|2
-t3412.L2|3
-t3412.L2|5
-t3412.L2|4
-t3412.end|Topology 'bug3412' dropped
-t3371.start|t
-t3371.L1|1
-t3371.L2|3
-t3371.L2|2
-t3371.end|Topology 'bug3711' dropped

Deleted: trunk/topology/test/regress/topogeo_addlinestring_expected_oldsnap
===================================================================
--- trunk/topology/test/regress/topogeo_addlinestring_expected_oldsnap	2017-10-20 15:28:05 UTC (rev 16022)
+++ trunk/topology/test/regress/topogeo_addlinestring_expected_oldsnap	2017-10-20 18:22:38 UTC (rev 16023)
@@ -1,205 +0,0 @@
-BEGIN
-t
-9
-22
-26
-COMMIT
-max|node|22
-max|edge|26
-ERROR:  Invalid geometry type (MULTILINESTRING) passed to TopoGeo_AddLinestring, expected LINESTRING
-ERROR:  Invalid geometry type (POINT) passed to TopoGeo_AddLinestring, expected LINESTRING
-ERROR:  No topology with name "invalid" in topology.topology
-iso_uni|27
-N|23||POINT(36 26)
-N|24||POINT(38 30)
-E|27|sn23|en24
-iso_f5|28
-N|25||POINT(37 20)
-N|26||POINT(41 16)
-E|28|sn25|en26
-iso_ex|27
-iso_ex_tol|27
-noniso_ex|18
-noniso_ex_tol|18
-contained|29
-N|27||POINT(35 8)
-N|28||POINT(35 12)
-E|18|sn10|en27
-E|29|sn27|en28
-E|30|sn28|en13
-overlap|31
-overlap|32
-N|29||POINT(49 22)
-N|30||POINT(45 22)
-E|8|sn18|en30
-E|31|sn19|en29
-E|32|sn30|en19
-cross|34
-cross|35
-N|31||POINT(49 18)
-N|32||POINT(47 17.6)
-N|33||POINT(44 17)
-E|15|sn12|en32
-E|33|sn32|en19
-E|34|sn31|en32
-E|35|sn32|en33
-snap|7
-snap|36
-snap|39
-N|34||POINT(18 22)
-N|35||POINT(22.4 22)
-N|36||POINT(21 20.4)
-E|6|sn16|en34
-E|7|sn17|en35
-E|19|sn14|en36
-E|36|sn34|en17
-E|37|sn35|en18
-E|38|sn36|en17
-E|39|sn35|en36
-snap_again|7
-snap_again|36
-snap_again|39
-crossover|42
-crossover|44
-crossover|45
-crossover|46
-N|37||POINT(9 20)
-N|38||POINT(16.2 14)
-N|39||POINT(21 10)
-N|40||POINT(9 18)
-N|41||POINT(21 7)
-E|9|sn15|en38
-E|20|sn9|en41
-E|21|sn15|en40
-E|40|sn37|en16
-E|41|sn38|en14
-E|42|sn37|en38
-E|43|sn39|en14
-E|44|sn38|en39
-E|45|sn40|en37
-E|46|sn41|en39
-crossover_again|42
-crossover_again|44
-crossover_again|45
-crossover_again|46
-contains|25
-contains|47
-contains|48
-N|42||POINT(7 36)
-N|43||POINT(14 34)
-E|47|sn21|en42
-E|48|sn43|en22
-nodecross|49
-nodecross|50
-N|44||POINT(18 37)
-N|45||POINT(22 37)
-E|49|sn44|en4
-E|50|sn4|en45
-iso_ex_2segs|28
-#1613.1|51
-N|46||POINT(556267.6 144887)
-N|47||POINT(556267 144887.4)
-E|51|sn46|en47
-#1613.2|53
-#1613.2|54
-N|48||POINT(556250 144887)
-N|49||POINT(556267.6 144887)
-N|50||POINT(556310 144887)
-E|51|sn46|en49
-E|52|sn49|en47
-E|53|sn48|en49
-E|54|sn49|en50
-#1631.1|55
-N|51||POINT(556267.6 144887)
-N|52||POINT(556267.6 144888)
-E|55|sn51|en52
-#1631.2|56
-#1631.2|57
-N|53||POINT(556254.6 144886.6)
-N|54||POINT(556267.6 144887)
-E|56|sn53|en51
-E|57|sn51|en54
-#1641.1|58
-N|55||POINT(-0.2 0.4)
-N|56||POINT(0.2 0.4)
-E|58|sn55|en56
-#1641.2|60
-#1641.2|61
-N|57||POINT(0 0.2)
-N|58||POINT(0 0.4)
-N|59||POINT(0 0.4)
-E|58|sn55|en58
-E|59|sn58|en56
-E|60|sn57|en58
-E|61|sn58|en59
-#1641.3|62
-N|60||POINT(-0.2 0.4)
-N|61||POINT(0.2 0.4)
-E|62|sn60|en61
-#1641.4|64
-#1641.4|65
-N|62||POINT(0 0.2)
-N|63||POINT(0 0.4)
-N|64||POINT(0 0.4)
-E|62|sn60|en63
-E|63|sn63|en61
-E|64|sn62|en63
-E|65|sn63|en64
-#1650.1
-N|65|0|POINT(0 0)
-#1650.3|66
-N|66||POINT(10 0)
-E|66|sn65|en66
-#1654.1|N|67
-N|67|0|POINT(0 0)
-#1654.2|67
-#1654.2|68
-N|68||POINT(-10 1)
-N|69||POINT(10 1)
-E|67|sn68|en67
-E|68|sn67|en69
-#1706.1|E|69
-N|70||POINT(20 10)
-N|71||POINT(10 20)
-E|69|sn70|en71
-#1706.2|E*|69
-#1706.2|E*|71
-N|72||POINT(10 0)
-N|73||POINT(9 12)
-E|69|sn70|en73
-E|70|sn73|en71
-E|71|sn72|en73
-#1714.1|N|74
-N|74|0|POINT(10 0)
-#1714.2|E*|72
-N|75||POINT(0 20)
-E|72|sn74|en75
-Topology 'city_data' dropped
-t3280.start|t
-t3280|L11
-t3280|L22
-t3280|L1b4
-t3280|L1b2
-t3280.end|Topology 'bug3280' dropped
-t3380.start|t
-t3380.L1|1
-t3380.L2|3
-t3380.L2|4
-t3380.L3|5
-t3380.end|Topology 'bug3380' dropped
-t3402.start|t
-t3402.L1|1
-t3402.L2|3
-t3402.end|Topology 'bug3402' dropped
-t3412.start|t
-t3412.L1|1
-t3412.L2|2
-t3412.L2|3
-t3412.L2|5
-t3412.L2|4
-t3412.end|Topology 'bug3412' dropped
-t3371.start|t
-t3371.L1|1
-t3371.L2|3
-t3371.L2|2
-t3371.end|Topology 'bug3711' dropped

More information about the postgis-tickets mailing list