[postgis-tickets] [SCM] PostGIS branch stable-2.5 updated. 2.5.7-18-ga15932c36

git at osgeo.org git at osgeo.org
Fri Aug 12 08:01:32 PDT 2022


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, stable-2.5 has been updated
       via  a15932c364cd21d5ae47788b62df6e300a80ab8d (commit)
       via  09d2416240ab9d773b915493277f93ebd1681a73 (commit)
       via  73742528e7f4f42a9234064a74bbb1702ad166a7 (commit)
      from  316794da4b8e2e07369685f1903c12d4fdb88877 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a15932c364cd21d5ae47788b62df6e300a80ab8d
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Aug 12 17:01:06 2022 +0200

    Stop expecting SAVEPOINT/RELEASE output from tests
    
    Should fix regression test broken by upgrade
    of run_test.pl in commit 35b17931f

diff --git a/raster/test/regress/rt_count_expected b/raster/test/regress/rt_count_expected
index b3ef7a876..517c87ba5 100644
--- a/raster/test/regress/rt_count_expected
+++ b/raster/test/regress/rt_count_expected
@@ -15,7 +15,6 @@
 1000
 20
 1000
-SAVEPOINT
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
@@ -26,7 +25,4 @@ NOTICE:  Invalid band index (must use 1-based). Returning NULL
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-RELEASE
-SAVEPOINT
 ERROR:  Sample percent must be between zero and one
-RELEASE
diff --git a/raster/test/regress/rt_histogram_expected b/raster/test/regress/rt_histogram_expected
index 750835fcd..e2d2882f8 100644
--- a/raster/test/regress/rt_histogram_expected
+++ b/raster/test/regress/rt_histogram_expected
@@ -74,7 +74,6 @@ NOTICE:  Invalid band index (must use 1-based). Returning NULL
 -10.000|-5.619|10|0.500
 -5.619|-1.239|0|0.000
 -1.239|3.142|10|0.500
-SAVEPOINT
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
@@ -86,12 +85,7 @@ NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 ERROR:  RASTER_histogramCoverage: Cannot get summary stats of coverage
-RELEASE
-SAVEPOINT
 -10.000|-3.429|10|0.500
 -3.429|3.142|10|0.500
-RELEASE
-SAVEPOINT
 -10.000|-3.429|10|0.500
 -3.429|3.142|10|0.500
-RELEASE
diff --git a/raster/test/regress/rt_quantile_expected b/raster/test/regress/rt_quantile_expected
index 013cf6e53..ff1716872 100644
--- a/raster/test/regress/rt_quantile_expected
+++ b/raster/test/regress/rt_quantile_expected
@@ -93,17 +93,9 @@ NOTICE:  Invalid band index (must use 1-based). Returning NULL
 3.142
 3.142
 3.142
-SAVEPOINT
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-RELEASE
-SAVEPOINT
 3.142
-RELEASE
-SAVEPOINT
 3.142
-RELEASE
-SAVEPOINT
 NOTICE:  Invalid value for quantile (must be between 0 and 1). Returning NULL
-RELEASE
diff --git a/raster/test/regress/rt_summarystats_expected b/raster/test/regress/rt_summarystats_expected
index fe34a2801..8bed7afff 100644
--- a/raster/test/regress/rt_summarystats_expected
+++ b/raster/test/regress/rt_summarystats_expected
@@ -14,7 +14,6 @@ NOTICE:  Band is empty as width and/or height is 0
 1000|-68.584|-0.069|1.046|-10.000|3.142
 20|-68.584|-3.429|6.571|-10.000|3.142
 20|-68.584|-3.429|6.571|-10.000|3.142
-SAVEPOINT
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
@@ -26,35 +25,15 @@ NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 0|||||
-RELEASE
-SAVEPOINT
 20|-68.584|-3.429|6.571|-10.000|3.142
-RELEASE
-SAVEPOINT
 20|-68.584|-3.429|6.571|-10.000|3.142
-RELEASE
-SAVEPOINT
 20|-68.584|-3.429|6.571|-10.000|3.142
-RELEASE
-SAVEPOINT
 20|-68.584|-3.429|6.571|-10.000|3.142
-RELEASE
-SAVEPOINT
 20|-68.584|-3.429|6.571|-10.000|3.142
-RELEASE
-SAVEPOINT
 1000|-68.584|-0.069|1.046|-10.000|3.142
-RELEASE
-SAVEPOINT
 1000|-68.584|-0.069|1.046|-10.000|3.142
-RELEASE
-SAVEPOINT
 1000|-68.584|-0.069|1.046|-10.000|3.142
-RELEASE
-SAVEPOINT
 ERROR:  Invalid sample percentage (must be between 0 and 1). Returning NULL
-RELEASE
-SAVEPOINT
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
@@ -66,4 +45,3 @@ NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 0|||||
-RELEASE
diff --git a/raster/test/regress/rt_valuecount_expected b/raster/test/regress/rt_valuecount_expected
index e22b0ddab..c5132868e 100644
--- a/raster/test/regress/rt_valuecount_expected
+++ b/raster/test/regress/rt_valuecount_expected
@@ -35,12 +35,6 @@ NOTICE:  Invalid band index (must use 1-based). Returning NULL
 0
 10
 0
-SAVEPOINT
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-RELEASE
-SAVEPOINT
 ERROR:  relation "test1" does not exist at character 20
-RELEASE
-SAVEPOINT
 ERROR:  column "rast1" does not exist at character 8
-RELEASE

commit 09d2416240ab9d773b915493277f93ebd1681a73
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Aug 12 16:58:46 2022 +0200

    Drop more custom SRIDs usages in tests

diff --git a/raster/test/regress/loader/Projected-post.sql b/raster/test/regress/loader/Projected-post.sql
index 2fc7692e6..496c8bf5f 100644
--- a/raster/test/regress/loader/Projected-post.sql
+++ b/raster/test/regress/loader/Projected-post.sql
@@ -1,4 +1,3 @@
-TRUNCATE spatial_ref_sys;
 -- should this be done automatically ?
 -- "loadedrast" is removed automatically !
 DROP TABLE o_2_loadedrast;
diff --git a/raster/test/regress/loader/Projected-pre.sql b/raster/test/regress/loader/Projected-pre.sql
index 61918bd1d..e69de29bb 100644
--- a/raster/test/regress/loader/Projected-pre.sql
+++ b/raster/test/regress/loader/Projected-pre.sql
@@ -1,8 +0,0 @@
--- NOTE: the need for truncation here reveals a leak bug in previous tests
-TRUNCATE spatial_ref_sys;
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text")
-VALUES
-(4326,'EPSG',4326,'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]','+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ')
-,
-('3857','EPSG','3857','PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs"],AUTHORITY["EPSG","3857"],AXIS["X",EAST],AXIS["Y",NORTH]]','+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs')
-;

commit 73742528e7f4f42a9234064a74bbb1702ad166a7
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Aug 12 16:51:09 2022 +0200

    run_test.pl: run psql in quiet mode when loading scripts

diff --git a/regress/run_test.pl b/regress/run_test.pl
index efafb29ae..c66331f5b 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -1383,7 +1383,7 @@ sub load_sql_file
 	if ( -e $file )
 	{
 		# ON_ERROR_STOP is used by psql to return non-0 on an error
-		my $psql_opts = "--no-psqlrc --variable ON_ERROR_STOP=true";
+		my $psql_opts = "--quiet --no-psqlrc --variable ON_ERROR_STOP=true";
 		my $cmd = "psql $psql_opts -c 'CREATE SCHEMA IF NOT EXISTS $OPT_SCHEMA' ";
 		$cmd .= "-c 'SET search_path TO $OPT_SCHEMA,topology'";
 		$cmd .= " -Xf $file $DB >> $REGRESS_LOG 2>&1";

-----------------------------------------------------------------------

Summary of changes:
 raster/test/regress/loader/Projected-post.sql |  1 -
 raster/test/regress/loader/Projected-pre.sql  |  8 --------
 raster/test/regress/rt_count_expected         |  4 ----
 raster/test/regress/rt_histogram_expected     |  6 ------
 raster/test/regress/rt_quantile_expected      |  8 --------
 raster/test/regress/rt_summarystats_expected  | 22 ----------------------
 raster/test/regress/rt_valuecount_expected    |  6 ------
 regress/run_test.pl                           |  2 +-
 8 files changed, 1 insertion(+), 56 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list