From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Wed, 22 Jul 2015 19:00:36 +0000 (+0000)
Subject: #3213, make interrupt tests opt-out
X-Git-Tag: 2.2.0rc1~222
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5212d72cb3cd2ce9091a710688338e1d09bf0973;p=postgis

#3213, make interrupt tests opt-out


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

diff --git a/configure.ac b/configure.ac
index 13ff48c99..025ec94ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1019,6 +1019,23 @@ fi
 
 AC_SUBST([TOPOLOGY])
 
+dnl ====================================
+dnl interrupt tests
+dnl ====================================
+INTERRUPTTESTS="no"
+AC_ARG_WITH([interrupt-tests],
+    [AS_HELP_STRING([--without-interrupt-tests],
+                    [Disable the interrupt tests (for CI servers)])],
+    [], [])
+
+if test "x$with_interrupt_tests" != "xno"; then
+    INTERRUPTTESTS="yes"
+fi
+
+AC_SUBST([INTERRUPTTESTS])
+
+
+
 dnl ===========================================================================
 dnl SRID stuff
 dnl ===========================================================================
diff --git a/regress/Makefile.in b/regress/Makefile.in
index ef865aee9..f7e8ae838 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -24,6 +24,7 @@ POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
 HAVE_JSON=@HAVE_JSON@
 HAVE_SFCGAL=@HAVE_SFCGAL@
 MINGWBUILD=@MINGWBUILD@
+INTERRUPTTESTS=@INTERRUPTTESTS@
 
 # MingW hack: rather than use PGSQL_BINDIR directly, we change
 # to the directory and then use "pwd" to return the path. This
@@ -73,29 +74,53 @@ TESTS = \
 	loader/mfile \
 	dumper/literalsrid \
 	dumper/realtable \
+	affine \
+	bestsrid \
 	binary \
+	boundary \
+	cluster \
+	concave_hull\
+	ctors \
+	dump \
+	dumppoints \
+	empty \
+	forcecurve \
+	geography \
+	in_geohash \
+	in_gml \
+	in_kml \
+	in_encodedpolyline \
+	iscollection \
+	legacy \
+	long_xact \
+	lwgeom_regress \
+	measures \
 	operators \
+	out_geometry \
+	out_geography \
+	polygonize \
+	polyhedralsurface \
+	postgis_type_name \
 	regress \
+	regress_bdpoly \
 	regress_index \
 	regress_index_nulls \
+	regress_management \
 	regress_selectivity \
-	lwgeom_regress \
 	regress_lrs \
+	regress_ogc \
+	regress_ogc_cover \
+	regress_ogc_prep \
+	regress_proj \
+	relate \
+	remove_repeated_points \
 	removepoint \
 	setpoint \
-	size \
 	simplify \
 	simplifyvw \
+	size \
 	snaptogrid \
-	summary \
-	affine \
-	empty \
-	forcecurve \
-	measures \
-	legacy \
-	long_xact \
-	cluster \
-	ctors \
+	split \
 	sql-mm-serialize \
 	sql-mm-circularstring \
 	sql-mm-compoundcurve \
@@ -103,40 +128,15 @@ TESTS = \
 	sql-mm-general \
 	sql-mm-multicurve \
 	sql-mm-multisurface \
-	polyhedralsurface \
-	polygonize \
-	postgis_type_name \
-	geography \
-	out_geometry \
-	out_geography \
-	in_geohash \
-	in_gml \
-	in_kml \
-	in_encodedpolyline \
-	interrupt \
-	iscollection \
-	regress_ogc \
-	regress_ogc_cover \
-	regress_ogc_prep \
-	regress_bdpoly \
-	regress_proj \
-	regress_management \
-	dump \
-	dumppoints \
-	boundary \
-	wmsservers \
-	wkt \
-	wkb \
+	swapordinates \
+	summary \
 	temporal \
 	tickets \
+	twkb \
 	typmod \
-	remove_repeated_points \
-	split \
-	swapordinates \
-	relate \
-	bestsrid \
-	concave_hull\
-	twkb
+	wkb \
+	wkt \
+	wmsservers
 
 ifeq ($(shell expr $(POSTGIS_PGSQL_VERSION) ">=" 91),1)
 ifeq ($(shell expr $(POSTGIS_PGSQL_VERSION) "<"  95),1)
@@ -180,15 +180,30 @@ ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 34),1)
 	# GEOS-3.4 adds:
 	# ST_DelaunayTriangles
 	TESTS += \
-		delaunaytriangles \
-		interrupt_buffer
+		delaunaytriangles 
 endif
 
+
+ifeq ($(INTERRUPTTESTS),yes)
+	# Allow CI servers to configure --with-interrupt-tests
+	TESTS += \
+  	interrupt
+
 ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">=" 30403),1)
 	TESTS += \
 		interrupt_relate
 endif
 
+ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 34),1)
+	# GEOS-3.4 adds:
+	# ST_DelaunayTriangles
+	TESTS += \
+		interrupt_buffer
+endif
+		 
+endif
+
+
 ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 35),1)
 	# GEOS-3.5 adds:
 	# ST_ClipByBox2d
@@ -197,6 +212,7 @@ ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 35),1)
 		subdivide
 endif
 
+
 ifeq ($(HAVE_JSON),yes)
 	# JSON-C adds:
 	# ST_GeomFromGeoJSON()