[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-318-g8b5d0f053
git at osgeo.org
git at osgeo.org
Thu Jan 20 08:00:41 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, master has been updated
via 8b5d0f053c9df6eefce9d565795cdf7dc3b72e1c (commit)
via 5d842fd2556ef9c7694609d5468a2d6e20f2cd2d (commit)
via d2280fb0d600bf8f2c826532d28a938cba583cd4 (commit)
via 5e1952d2b958318452560f0c96d6f0aa03b86bc8 (commit)
from 9816b8705562b4579f60dadd4a626eae9fd09597 (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 8b5d0f053c9df6eefce9d565795cdf7dc3b72e1c
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 20 16:02:28 2022 +0100
Drop deprecated -{pre,post}.sh files
diff --git a/raster/test/regress/load_outdb-post.sh b/raster/test/regress/load_outdb-post.sh
deleted file mode 100755
index 914c97b30..000000000
--- a/raster/test/regress/load_outdb-post.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-rm -f "$DIR/$TEST-pre.sql"
-#rm -f "$DIR/$TEST-post.sql"
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 5d842fd2556ef9c7694609d5468a2d6e20f2cd2d
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
commit d2280fb0d600bf8f2c826532d28a938cba583cd4
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 20 15:39:45 2022 +0100
Fix out-of-build check-regress (upgrade step)
References #5060
diff --git a/regress/runtest.mk b/regress/runtest.mk
index 888cb3e09..b337ee4ae 100644
--- a/regress/runtest.mk
+++ b/regress/runtest.mk
@@ -26,7 +26,7 @@ check-regress:
@if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
echo "Running upgrade test as RUNTESTFLAGS did not contain that"; \
- $(PERL) $(topsrcdir)/regress/run_test.pl \
+ POSTGIS_TOP_BUILD_DIR=$(abs_top_builddir) $(PERL) $(topsrcdir)/regress/run_test.pl \
--upgrade \
$(RUNTESTFLAGS) \
$(RUNTESTFLAGS_INTERNAL) \
commit 5e1952d2b958318452560f0c96d6f0aa03b86bc8
Author: Sandro Santilli <strk at kbt.io>
Date: Wed Jan 19 14:54:44 2022 +0100
[dronie] always use function-based upgrade when available
diff --git a/ci/dronie/postgis_regress.sh b/ci/dronie/postgis_regress.sh
index 0dae3653c..39af45e5b 100644
--- a/ci/dronie/postgis_regress.sh
+++ b/ci/dronie/postgis_regress.sh
@@ -18,7 +18,6 @@ make install
RUNTESTFLAGS=-v make installcheck
CURRENTVERSION=`grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
-utils/check_all_upgrades.sh -s ${CURRENTVERSION} | tee check.log
-utils/check_all_upgrades.sh -s ${CURRENTVERSION}! | tee -a check.log
+utils/check_all_upgrades.sh -s ${CURRENTVERSION}! | tee check.log
echo "-- Summary of upgrade tests --"
egrep '(PASS|FAIL)' check.log
-----------------------------------------------------------------------
Summary of changes:
ci/dronie/postgis_regress.sh | 3 +-
raster/test/regress/Makefile.in | 5 +--
raster/test/regress/load_outdb-post.sh | 6 ----
raster/test/regress/load_outdb-pre.sh | 61 ----------------------------------
regress/runtest.mk | 2 +-
5 files changed, 5 insertions(+), 72 deletions(-)
delete mode 100755 raster/test/regress/load_outdb-post.sh
delete mode 100755 raster/test/regress/load_outdb-pre.sh
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list