From 9d03ce59214d11d9a6ebe58d05ef18708ff04f74 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 16 Feb 2011 09:12:50 +0000 Subject: [PATCH] Only run ST_isValidDetail if GEOS is >= 3.3 -- Reduce tests for GEOS version grouping togheter tests depending on the same version [RT-SIGTA] git-svn-id: http://svn.osgeo.org/postgis/trunk@6827 b70326c6-7e19-0410-871a-916f4a2858ee --- regress/Makefile.in | 46 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/regress/Makefile.in b/regress/Makefile.in index 1f4071d63..13c63b7db 100644 --- a/regress/Makefile.in +++ b/regress/Makefile.in @@ -73,43 +73,29 @@ TESTS = \ wmsservers_new \ tickets \ remove_repeated_points \ - split \ - isvaliddetail + split # TESTS += wmsservers_old -# Styled buffer only if GEOS >= 3.2 -ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 32),1) - TESTS += regress_buffer_params -endif -# Hausdorff only if GEOS >= 3.2 ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 32),1) - TESTS += hausdorff -endif - -# ST_MakeClean if GEOS > 3.2 -ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">" 32),1) - TESTS += clean -endif - -# ST_RelateMatch if GEOS >= 3.3 -ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 33),1) - TESTS += relatematch -endif - -# ST_SharedPaths if GEOS >= 3.3 -ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 33),1) - TESTS += sharedpaths -endif - -# ST_Snap if GEOS >= 3.3 -ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 33),1) - TESTS += snap + # GEOS-3.3 adds: + # ST_HausdorffDistance, ST_Buffer(params) + TESTS += \ + hausdorff \ + regress_buffer_params endif -# ST_UnaryUnion if GEOS >= 3.3 ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 33),1) - TESTS += unaryunion + # GEOS-3.3 adds: + # ST_RelateMatch, ST_IsValidDetail, ST_SharedPaths , + # ST_Snap, ST_UnaryUnion, ST_MakeClean + TESTS += \ + relatematch \ + isvaliddetail \ + sharedpaths \ + snap \ + unaryunion \ + clean endif all install uninstall distclean: -- 2.50.1