[postgis-tickets] [SCM] PostGIS branch out-of-tree-builds updated. 3.2.0-317-g25faf296a

git at osgeo.org git at osgeo.org
Thu Jan 20 07:04:02 PST 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, out-of-tree-builds has been updated
       via  25faf296a62ba40a79dee476b0257146053be410 (commit)
       via  c35d46d2ec43a1303ab8d95818c9dfc714d295bd (commit)
      from  ee656108d4515bb857ddef134eae1b4cc7b066e3 (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 25faf296a62ba40a79dee476b0257146053be410
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jan 20 16:02:28 2022 +0100

    Drop deprecated -pre.sh file

diff --git a/raster/test/regress/load_outdb-pre.sh b/raster/test/regress/load_outdb-pre.sh
deleted file mode 100755
index 6b05b9e64..000000000
--- a/raster/test/regress/load_outdb-pre.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-FILERASTER="$DIR/loader/testraster.tif"
-
-# special handling for msys
-CSYS=`uname -o | tr '[:upper:]' '[:lower:]'`
-if [ "$CSYS" == "msys" ]; then
-	FILERASTER=`cmd //c echo "${FILERASTER}"`
-fi
-
-SQL=" \
-WITH foo AS ( \
-	SELECT postgis_raster_lib_version() \
-) \
-SELECT NULL FROM foo; \
-SET postgis.gdal_enabled_drivers = 'GTiff'; \
-DROP TABLE IF EXISTS raster_outdb_template; \
-CREATE TABLE raster_outdb_template AS \
-SELECT \
-	1 AS rid, \
-	ST_AddBand( -- insert all three bands of out-db raster at index 1 \
-		ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0), \
-		1, '$FILERASTER'::text, NULL::int[] \
-	) AS rast \
-UNION ALL \
-SELECT \
-	2 AS rid, \
-	ST_AddBand( -- append all three bands of out-db raster \
-		ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0), \
-		'$FILERASTER'::text, NULL::int[] \
-	) AS rast \
-UNION ALL \
-SELECT \
-	3 AS rid, \
-	ST_AddBand( -- append out-db band 2 \
-		ST_AddBand( \
-			ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0), \
-			1, '8BUI', 1, 0 \
-		), \
-		'$FILERASTER'::text, ARRAY[2]::int[] \
-	) AS rast \
-UNION ALL \
-SELECT \
-	4 AS rid, \
-	ST_AddBand( -- append out-db band 2 \
-		ST_AddBand( \
-			ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0), \
-			1, '8BUI', 1, 0 \
-		), \
-		'$FILERASTER'::text, ARRAY[2]::int[], \
-		1, \
-		255 \
-	) AS rast \
-"
-
-echo "$SQL" > "$DIR/$TEST-pre.sql"
-
-# no longer needed as "clean" test takes care of it
-#echo "DROP TABLE IF EXISTS raster_outdb_template;" > "$DIR/$TEST-post.sql"

commit c35d46d2ec43a1303ab8d95818c9dfc714d295bd
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jan 20 15:54:05 2022 +0100

    Fix REGRESS_INSTALLDIR for out-of-tree raster regress tests
    
    References #5060

diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index a932ab857..6492bb99c 100644
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -1,6 +1,6 @@
 #############################################################################
 #
-# Copyright (c) 2009-2020 Sandro Santilli <strk at kbt.io>
+# Copyright (c) 2009-2022 Sandro Santilli <strk at kbt.io>
 # Copyright (c) 2009 Pierre Racine <pierre.racine at sbf.ulaval.ca>
 # Copyright (c) 2011 Jorge Arevalo <jorge.arevalo at deimos-space.com>
 # Copyright (c) 2011-2013 Regents of the University of California
@@ -26,6 +26,7 @@
 
 top_srcdir = @top_srcdir@
 srcdir = @srcdir@
+top_builddir = @top_builddir@
 
 POSTGIS_SRC=../../..
 PERL=@PERL@
@@ -37,7 +38,7 @@ PERL=@PERL@
 PGSQL_BINDIR=$(shell cd "@PGSQL_BINDIR@" && pwd)
 
 # Where we put our regression installation
-REGRESS_INSTALLDIR=$(POSTGIS_SRC)/regress/00-regress-install
+REGRESS_INSTALLDIR = $(realpath $(top_builddir) )/regress/00-regress-install
 
 #
 # Put path from pg_config into front of search path

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

Summary of changes:
 raster/test/regress/Makefile.in       |  5 +--
 raster/test/regress/load_outdb-pre.sh | 61 -----------------------------------
 2 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100755 raster/test/regress/load_outdb-pre.sh


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list