[Git][debian-gis-team/postgis][apt.postgresql.org/postgis-2.5] Drop tests that changed with GDAL 3.1.
Christoph Berg
gitlab at salsa.debian.org
Mon Aug 17 15:32:40 BST 2020
Christoph Berg pushed to branch apt.postgresql.org/postgis-2.5 at Debian GIS Project / postgis
Commits:
0d548e6e by Christoph Berg at 2020-08-17T16:32:26+02:00
Drop tests that changed with GDAL 3.1.
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/gdal3.1
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -2,6 +2,7 @@ postgis-2.5 (2.5.5+dfsg-1) unstable; urgency=medium
* New upstream version.
* Work around build failure with GCC 10.
+ * Drop tests that changed with GDAL 3.1.
-- Christoph Berg <myon at debian.org> Mon, 17 Aug 2020 14:52:20 +0200
=====================================
debian/patches/gdal3.1
=====================================
@@ -0,0 +1,247 @@
+Description: Drop tests that changed with GDAL 3.1
+
+--- a/raster/test/regress/rt_gdalwarp.sql
++++ b/raster/test/regress/rt_gdalwarp.sql
+@@ -57,12 +57,6 @@ INSERT INTO raster_gdalwarp_dst (rid, ra
+ 0.0, (SELECT _st_gdalwarp(
+ NULL
+ ))
+-), (
+- 0.1, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbour', 0.125,
+- 993310
+- ) FROM raster_gdalwarp_src)
+ ), /**(
+ 0.2, (SELECT _st_gdalwarp(
+ rast,
+@@ -70,21 +64,6 @@ INSERT INTO raster_gdalwarp_dst (rid, ra
+ 993309
+ ) FROM raster_gdalwarp_src)
+ ),**/ (
+- 0.3, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbour', 0.125,
+- 994269
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.4, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbor', 0.125,
+- 993310,
+- 500., 500.,
+- NULL, NULL,
+- 0, 0
+- ) FROM raster_gdalwarp_src)
+-), (
+ 0.5, (SELECT _st_gdalwarp(
+ rast,
+ 'NearestNeighbor', 0.125,
+@@ -172,22 +151,6 @@ INSERT INTO raster_gdalwarp_dst (rid, ra
+ 0, 0
+ ) FROM raster_gdalwarp_src)
+ ), (
+- 0.16, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbor', 0.125,
+- 993310,
+- 50., 50.,
+- -290, 7
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.17, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbor', 0.125,
+- 993309,
+- 50., 50.,
+- -290, 7
+- ) FROM raster_gdalwarp_src)
+-), (
+ 0.18, (SELECT _st_gdalwarp(
+ rast,
+ 'NearestNeighbor', 0.125,
+@@ -197,54 +160,6 @@ INSERT INTO raster_gdalwarp_dst (rid, ra
+ 3, 3
+ ) FROM raster_gdalwarp_src)
+ ), (
+- 0.19, (SELECT _st_gdalwarp(
+- rast,
+- 'Cubic', 0,
+- 993310,
+- NULL, NULL,
+- NULL, NULL,
+- 3, 3
+- ) FROM raster_gdalwarp_src)
+-),/** (
+- 0.20, (SELECT _st_gdalwarp(
+- rast,
+- 'Bilinear', 0.125,
+- 993309,
+- NULL, NULL,
+- NULL, NULL,
+- 1, 3
+- ) FROM raster_gdalwarp_src)
+-),**/ (
+- 0.21, (SELECT _st_gdalwarp(
+- rast,
+- 'Cubic', 0,
+- 993310,
+- 500., 500.,
+- NULL, NULL,
+- 3, 3
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.22, (SELECT _st_gdalwarp(
+- rast,
+- 'CubicSpline', 0.125,
+- 993310,
+- 500., 500.,
+- -12048, 14682,
+- 0, 6
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.23, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbor', 0.125,
+- 984269
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.24, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbor', 0.125,
+- 974269
+- ) FROM raster_gdalwarp_src)
+-), (
+ 0.25, (SELECT _st_gdalwarp(
+ ST_SetGeoReference(ST_SetSRID(rast, 0), '1 0 0 -1 0 0'),
+ 'NearestNeighbor', 0.125,
+@@ -442,80 +357,15 @@ INSERT INTO raster_gdalwarp_dst (rid, ra
+
+ -- ST_Transform
+ INSERT INTO raster_gdalwarp_dst (rid, rast) VALUES (
+- 2.1, (SELECT ST_Transform(
+- rast,
+- 993310
+- ) FROM raster_gdalwarp_src)
+-),/** (
+- 2.2, (SELECT ST_Transform(
+- rast,
+- 993309
+- ) FROM raster_gdalwarp_src)
+-),**/ (
+- 2.3, (SELECT ST_Transform(
+- rast,
+- 994269
+- ) FROM raster_gdalwarp_src)
+-), (
+ 2.4, (SELECT ST_Transform(
+ rast,
+ 993310, NULL
+ ) FROM raster_gdalwarp_src)
+ ), (
+- 2.5, (SELECT ST_Transform(
+- rast,
+- 993310, 'Bilinear'
+- ) FROM raster_gdalwarp_src)
+-), (
+ 2.6, (SELECT ST_Transform(
+ rast,
+ 993310, 'Bilinear', NULL::double precision
+ ) FROM raster_gdalwarp_src)
+-), (
+- 2.7, (SELECT ST_Transform(
+- rast,
+- 993310, 'Cubic', 0.0
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.8, (SELECT ST_Transform(
+- rast,
+- 993310, 'NearestNeighbour', 0.0
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.9, (SELECT ST_Transform(
+- rast,
+- 993310, 'NearestNeighbor', 0.0
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.10, (SELECT ST_Transform(
+- 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
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.13, (SELECT ST_Transform(
+- rast,
+- 993310, 'CubicSpline', 0.1, 1500, 1500
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.14, (SELECT ST_Transform(
+- rast,
+- 993310, 500, 500
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.15, (SELECT ST_Transform(
+- rast,
+- 993310, 750
+- ) FROM raster_gdalwarp_src)
+ );
+
+ -- ST_Rescale
+--- a/raster/test/regress/rt_gdalwarp_expected
++++ b/raster/test/regress/rt_gdalwarp_expected
+@@ -8,26 +8,16 @@ NOTICE: Raster has default geotransform
+ NOTICE: Values must be provided for both X and Y when specifying the scale. Returning original raster
+ NOTICE: Values must be provided for both X and Y when specifying the scale. Returning original raster
+ 0.0|||||||||||||
+-0.1|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+ 0.10|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+ 0.11|992163|11|10|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
+ 0.12|992163|10|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t
+ 0.13|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500100.000|600950.000|t|t|t
+ 0.14|992163|201|201|1|50.000|50.000|0.000|0.000|-500040.000|589957.000|t|t|t
+ 0.15|992163|84|84|1|121.000|121.000|0.000|0.000|-500093.000|589875.000|t|t|t
+-0.16|993310|243|243|1|50.000|50.000|0.000|0.000|950710.000|1397157.000|t|t|t
+-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.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
+-0.24|974269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
+ 0.25|0|5|5|1|2.000|-2.000|0.000|0.000|0.000|0.000|t|t|t
+ 0.26|0|2|2|1|5.000|-5.000|0.000|0.000|0.000|0.000|t|t|t
+ 0.27|0|100|100|1|0.100|-0.100|0.000|0.000|0.000|0.000|t|t|t
+-0.3|994269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
+-0.4|993310|24|24|1|500.000|500.000|0.000|0.000|950732.188|1397281.783|t|t|t
+ 0.5|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+ 0.6|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+ 0.7|992163|20|20|1|500.000|500.000|0.000|0.000|-500000.000|590000.000|t|t|t
+@@ -59,19 +49,8 @@ NOTICE: Values must be provided for bot
+ 1.7|992163|40|40|1|250.000|250.000|0.000|0.000|-500000.000|590000.000|t|t|t
+ 1.8|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+ 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.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.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
+ 2.6|||||||||||||
+-2.7|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+-2.8|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+-2.9|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+ 3.1|992163|100|100|1|100.000|100.000|0.000|0.000|-500000.000|590000.000|t|t|t
+ 3.2|992163|100|100|1|100.000|100.000|0.000|0.000|-500000.000|590000.000|t|t|t
+ 3.3|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ link-liblwgeom
relax-test-timing-constraints.patch
regress-pg-config
raster-disable-test
+gdal3.1
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/0d548e6e4b0996ab2675e2b8bec53a4e21c1b2dd
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/0d548e6e4b0996ab2675e2b8bec53a4e21c1b2dd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200817/e08550de/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list