version garden test files so now named raster_gardentest_20.sql, postgis_gardentest_2...

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

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 1aea349a8252c2b277fa0d1d792d2cf9f6d07fc2..dbba87f882eabb3b74a7c573fa575794e8202ef3 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -153,7 +153,8 @@ ifeq ($(XSLTPROC),)
 garden: requirements_not_met_xsltproc
 else
 garden:        postgis_aggs_mm.xml
-       $(XSLTPROC) -o gardentest.sql xsl/postgis_gardentest.sql.xsl postgis.xml
+       $(XSLTPROC) -o postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql xsl/postgis_gardentest.sql.xsl postgis.xml
+       $(XSLTPROC) -o raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql xsl/raster_gardentest.sql.xsl postgis.xml
 endif
 
 

diff --git a/doc/xsl/raster_gardentest.sql.xsl b/doc/xsl/raster_gardentest.sql.xsl
index 614d7012747d206911f98bb359d2a54b758c4c74..6f7b371f54fdc36795c8c5ab2c02ccb6b6df2088 100644 (file)
--- a/doc/xsl/raster_gardentest.sql.xsl
+++ b/doc/xsl/raster_gardentest.sql.xsl
@@ -32,6 +32,7 @@
        <xsl:variable name='var_pixeltypes'>{8BUI,1BB}</xsl:variable>
        <xsl:variable name='var_pixelvalues'>{255,0}</xsl:variable>
        <xsl:variable name='var_pt'>ST_Centroid(rast1.rast::geometry)</xsl:variable>
+       <xsl:variable name='var_reclassarg'>ROW(2, '0-100:1-10, 101-500:11-150,501 - 10000: 151-254', '8BUI', 255)</xsl:variable>
        <xsl:variable name='var_georefcoords'>'2 0 0 3 0.5 0.5'</xsl:variable>
        <xsl:variable name='var_logupdatesql'>UPDATE <xsl:value-of select="$var_logtable" /> SET log_end = clock_timestamp() 
                FROM (SELECT logid FROM <xsl:value-of select="$var_logtable" /> ORDER BY logid DESC limit 1) As foo
@@ -440,6 +441,9 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
                                        <xsl:when test="contains(type, 'integer')">
                                                <xsl:value-of select="$var_integer2" />
                                        </xsl:when>
+                                       <xsl:when test="contains(type,'reclassarg')">
+                                               <xsl:value-of select="$var_reclassarg" />
+                                       </xsl:when>
                                        <xsl:when test="contains(type, 'text')">
                                                <xsl:value-of select="$var_text" />
                                        </xsl:when>

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 0d1b585f4da6551c1539c87f36959d18c14fc192..aaf055a95f09c5f14ba3644f5e841b83394ceb26 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -134,8 +134,8 @@ garden:
        @echo 'Regression tests in progress (it will take time)'
        @echo 'Result output: ./regress/garden_result.txt'
        @echo '-------------------------------------------------'
-       psql -d postgis_garden < ../doc/gardentest.sql > garden_result.txt 2>&1
-       dropdb postgis_garden
+       psql -d postgis_garden < ../doc/postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > postgis_garden_result.txt 2>&1
+       #dropdb postgis_garden
 
 cleanup:
        @sleep 1