Re-enable gdal tests

Reverts r16688

Closes #4104
Closes https://github.com/postgis/postgis/pull/450

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

diff --git a/raster/test/regress/rt_gdalwarp.sql b/raster/test/regress/rt_gdalwarp.sql
index bbdb6bfe604fcd53c5b143ec9ac2329879f9abfc..b1f12b82d242b584b1d65188be7ba59e3366f87e 100644 (file)
--- a/raster/test/regress/rt_gdalwarp.sql
+++ b/raster/test/regress/rt_gdalwarp.sql
@@ -50,8 +50,6 @@ INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4tex
 INSERT INTO "spatial_ref_sys" ("srid","auth_name","srtext","proj4text") VALUES (984269,'EPSG','GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]]','+proj=longlat +ellps=GRS80 +datum=NAD83 +no_defs ');
 INSERT INTO "spatial_ref_sys" ("srid","srtext") VALUES (974269,'GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]]');
 
--- Take out some testing of srid 993309 since it fails on Proj.5 with GDAL 2.2.4, GDAL 2.3.0
--- See #4104. Put back after we start testing proj.5 and issue is fixed in proj.
 -- _st_gdalwarp
 INSERT INTO raster_gdalwarp_dst (rid, rast) VALUES (
        0.0, (SELECT _st_gdalwarp(
@@ -63,13 +61,13 @@ INSERT INTO raster_gdalwarp_dst (rid, rast) VALUES (
                'NearestNeighbour', 0.125,
                993310
        ) FROM raster_gdalwarp_src)
-), /**(
+), (
        0.2, (SELECT _st_gdalwarp(
                rast,
                'NearestNeighbour', 0.125,
                993309
        ) FROM raster_gdalwarp_src)
-),**/ (
+), (
        0.3, (SELECT _st_gdalwarp(
                rast,
                'NearestNeighbour', 0.125,
@@ -205,7 +203,7 @@ INSERT INTO raster_gdalwarp_dst (rid, rast) VALUES (
                NULL, NULL,
                3, 3
        ) FROM raster_gdalwarp_src)
-),/** (
+), (
        0.20, (SELECT _st_gdalwarp(
                rast,
                'Bilinear', 0.125,
@@ -214,7 +212,7 @@ INSERT INTO raster_gdalwarp_dst (rid, rast) VALUES (
                NULL, NULL,
                1, 3
        ) FROM raster_gdalwarp_src)
-),**/ (
+), (
        0.21, (SELECT _st_gdalwarp(
                rast,
                'Cubic', 0,
@@ -446,12 +444,12 @@ INSERT INTO raster_gdalwarp_dst (rid, rast) VALUES (
                rast,
                993310
        ) FROM raster_gdalwarp_src)
-),/**   (
+), (
        2.2, (SELECT ST_Transform(
                rast,
                993309
        ) FROM raster_gdalwarp_src)
-),**/ (
+), (
        2.3, (SELECT ST_Transform(
                rast,
                994269
@@ -491,12 +489,12 @@ INSERT INTO raster_gdalwarp_dst (rid, rast) VALUES (
                rast,
                993310, 'NearestNeighbor', 0.125, 500, 500
        ) FROM raster_gdalwarp_src)
-),/** (
+), (
        2.11, (SELECT ST_Transform(
                rast,
                993309, 'Cubic', 0., 100, 100
        ) FROM raster_gdalwarp_src)
-),**/ (
+), (
        2.12, (SELECT ST_Transform(
                rast,
                993310, 'CubicSpline', 0., 2000, 2000

diff --git a/raster/test/regress/rt_gdalwarp_expected b/raster/test/regress/rt_gdalwarp_expected
index 531e407fef2b583732700ae7879b6075ff7de59d..df0da040a6c2d5fed4560c9b3b2f4dc9015e6047 100644 (file)
--- a/raster/test/regress/rt_gdalwarp_expected
+++ b/raster/test/regress/rt_gdalwarp_expected
@@ -19,6 +19,8 @@ NOTICE:  Values must be provided for both X and Y when specifying the scale.  Re
 0.17|993309|243|243|1|50.000|50.000|0.000|0.000|950760.000|1396957.000|t|t|t
 0.18|992163|10|10|1|1000.000|-1000.000|3.000|3.000|-500030.000|600000.000|t|t|t
 0.19|993310|12|12|1|1009.894|-1009.894|3.000|3.000|950691.792|1409281.783|t|t|t
+0.2|993309|12|12|1|1009.916|-1009.916|0.000|0.000|950762.305|1409088.896|t|t|t
+0.20|993309|12|12|1|1009.916|-1009.916|1.000|3.000|950742.107|1409088.896|t|t|t
 0.21|993310|24|24|1|500.000|500.000|3.000|3.000|950657.188|1397356.783|t|t|t
 0.22|993310|26|26|1|500.000|500.000|0.000|6.000|950452.000|1396632.000|t|t|t
 0.23|984269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
@@ -61,10 +63,12 @@ NOTICE:  Values must be provided for both X and Y when specifying the scale.  Re
 1.9|992163|11|10|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
 2.1|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
 2.10|993310|24|24|1|500.000|500.000|0.000|0.000|950732.188|1397281.783|t|t|t
+2.11|993309|121|121|1|100.000|100.000|0.000|0.000|950762.305|1396988.896|t|t|t
 2.12|993310|6|6|1|2000.000|2000.000|0.000|0.000|950732.188|1397281.783|t|t|t
 2.13|993310|8|8|1|1500.000|1500.000|0.000|0.000|950732.188|1397281.783|t|t|t
 2.14|993310|24|24|1|500.000|500.000|0.000|0.000|950732.188|1397281.783|t|t|t
 2.15|993310|16|16|1|750.000|750.000|0.000|0.000|950732.188|1397281.783|t|t|t
+2.2|993309|12|12|1|1009.916|-1009.916|0.000|0.000|950762.305|1409088.896|t|t|t
 2.3|994269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
 2.4|||||||||||||
 2.5|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t