[postgis-tickets] r17401 - [travis] run garden tests on CI.

Darafei komzpa at gmail.com
Sun Apr 21 02:33:12 PDT 2019


Author: komzpa
Date: 2019-04-21 02:33:12 -0700 (Sun, 21 Apr 2019)
New Revision: 17401

Modified:
   trunk/.travis.yml
   trunk/liblwgeom/lwinline.h
   trunk/postgis/lwgeom_ogc.c
   trunk/regress/Makefile.in
Log:
[travis] run garden tests on CI.

Crashes of documented things will get reported.

Closes https://github.com/postgis/postgis/pull/396


Modified: trunk/.travis.yml
===================================================================
--- trunk/.travis.yml	2019-04-20 20:40:43 UTC (rev 17400)
+++ trunk/.travis.yml	2019-04-21 09:33:12 UTC (rev 17401)
@@ -5,6 +5,7 @@
 language: c
 
 env:
+  - tag=pg11-geos37-gdal24-proj52 mode=garden
   - tag=latest mode=tests
   - tag=pg11-geos37-gdal24-proj52 mode=debug
   - tag=pg11-geos37-gdal24-proj52 mode=coverage
@@ -19,7 +20,6 @@
 matrix:
   allow_failures:
     - env: tag=latest mode=tests
-    - env: tag=pg11-geos37-gdal24-proj52 mode=coverage
 
 script:
   - echo "/tmp/logbt-coredumps/core.%p.%E" | sudo tee /proc/sys/kernel/core_pattern

Modified: trunk/liblwgeom/lwinline.h
===================================================================
--- trunk/liblwgeom/lwinline.h	2019-04-20 20:40:43 UTC (rev 17400)
+++ trunk/liblwgeom/lwinline.h	2019-04-21 09:33:12 UTC (rev 17401)
@@ -72,7 +72,7 @@
 #if PARANOIA_LEVEL > 0
 	assert(pa);
 	assert(n <= pa->npoints);
-	assert(n < pa->maxpoints);
+	assert(n <= pa->maxpoints);
 #endif
 
 	size = ptarray_point_size(pa);

Modified: trunk/postgis/lwgeom_ogc.c
===================================================================
--- trunk/postgis/lwgeom_ogc.c	2019-04-20 20:40:43 UTC (rev 17400)
+++ trunk/postgis/lwgeom_ogc.c	2019-04-21 09:33:12 UTC (rev 17401)
@@ -898,10 +898,14 @@
 	bytea *result;
 	uint8_t variant = WKB_ISO;
 
+	if (PG_ARGISNULL(0))
+		PG_RETURN_NULL();
+
 	/* Get a 2D version of the geometry */
 	geom = PG_GETARG_GSERIALIZED_P(0);
 	lwgeom = lwgeom_from_gserialized(geom);
 
+
 	/* If user specified endianness, respect it */
 	if ( (PG_NARGS()>1) && (!PG_ARGISNULL(1)) )
 	{

Modified: trunk/regress/Makefile.in
===================================================================
--- trunk/regress/Makefile.in	2019-04-20 20:40:43 UTC (rev 17400)
+++ trunk/regress/Makefile.in	2019-04-21 09:33:12 UTC (rev 17401)
@@ -72,16 +72,18 @@
 	$(PERL) -pi.bak -e 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' $(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql
 	#$(MAKE) -C ../loader REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
 
-garden:
+garden: staged-install
 	createdb postgis_garden
 	createlang plpgsql postgis_garden || true #tolerate an error here
-	psql -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/postgis.sql && \
-	psql -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/spatial_ref_sys.sql || true # tolerate an error here
-	psql -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/rtpostgis.sql || true #tolerate an error here
+	psql --no-psqlrc --variable ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/postgis.sql && \
+	psql --no-psqlrc --variable ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/spatial_ref_sys.sql || true # tolerate an error here
+	psql --no-psqlrc --variable ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/rtpostgis.sql || true #tolerate an error here
 	@echo '-------------------------------------------------'
 	@echo 'Regression tests in progress (it will take time)'
 	@echo 'Result output: ./regress/postgis_garden_result.txt'
 	@echo '-------------------------------------------------'
-	psql -ad postgis_garden < ../doc/postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > postgis_garden_result.txt 2>&1
-	psql -ad postgis_garden < ../doc/raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > raster_garden_result.txt 2>&1
+	psql --no-psqlrc -ad postgis_garden < ../doc/postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > postgis_garden_result.txt 2>&1
+	tail postgis_garden_result.txt
+	psql --no-psqlrc -ad postgis_garden < ../doc/raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > raster_garden_result.txt 2>&1
+	tail raster_garden_result.txt
 	#dropdb postgis_garden



More information about the postgis-tickets mailing list