[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-388-gbe464e4bd
git at osgeo.org
git at osgeo.org
Thu Jan 27 13:16:51 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 be464e4bd76bd9691f0297bb09001ec671f141cc (commit)
via d5a9b1b5b1e0a036bafa01882c5cbe26b1f32f58 (commit)
from 1090436f14fa3641834df6540fa2a4f35dbb8c3f (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 be464e4bd76bd9691f0297bb09001ec671f141cc
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 27 20:16:59 2022 +0100
[gitlab-ci] Really make source tree immutable
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69a6b525b..b91e1b9fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@
- ./configure
- make maintainer-clean
- ./autogen.sh
- - chmod -R a-w .
+ - chattr -R +i . # mark source tree as immutable
- export SRCDIR="${PWD}"
- echo "SRCDIR is ${SRCDIR}"
- mkdir /tmp/build && cd /tmp/build
commit d5a9b1b5b1e0a036bafa01882c5cbe26b1f32f58
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 27 21:33:44 2022 +0100
Another pre/post machinery replaced with .tif.ref files
References #5068
diff --git a/raster/test/regress/load_outdb-post.pl b/raster/test/regress/load_outdb-post.pl
deleted file mode 100755
index 4d6facb8a..000000000
--- a/raster/test/regress/load_outdb-post.pl
+++ /dev/null
@@ -1,2 +0,0 @@
-unlink $TEST . "-pre.sql";
-#unlink $TEST . "-post.sql";
diff --git a/raster/test/regress/load_outdb-pre.pl b/raster/test/regress/load_outdb-pre.pl
deleted file mode 100755
index ec6782aab..000000000
--- a/raster/test/regress/load_outdb-pre.pl
+++ /dev/null
@@ -1,69 +0,0 @@
-use File::Basename;
-use Cwd 'abs_path';
-
-my $REGDIR = abs_path(dirname($0));
-my $RASTERDIR = abs_path($REGDIR . "/../raster/test/regress");
-my $FILERASTER = $RASTERDIR . "/loader/testraster.tif";
-
-# special handling for msys
-if (lc($^O) eq "msys") {
- $FILERASTER = `cmd //c echo "$FILERASTER"`;
- $FILERASTER =~ s/^\s+//;
- $FILERASTER =~ s/\s+$//;
-}
-
-my $sql = <<"END";
-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( -- in-db band
- 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( -- in-db band
- ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0),
- 1, '8BUI', 1, 0
- ),
- '$FILERASTER'::text, ARRAY[2]::int[],
- 1,
- 255
- ) AS rast
-END
-
-my $PREFNAME = $TEST . '-pre.sql';
-open(PRESQL, '>', $PREFNAME) || die ('Cannot open ' . $PREFNAME . ": $!");
-print PRESQL $sql;
-close(PRESQL);
-
-# no longer needed as the "clean" test takes care of it
-#my $POSTFNAME = $TEST . '-post.sql';
-#open(POSTSQL, '>', $POSTFNAME) || die ('Cannot open ' . $POSTFNAME . ": $!");;
-#print POSTSQL "DROP TABLE IF EXISTS raster_outdb_template;\n";
-#close(POSTSQL);
diff --git a/raster/test/regress/loader/load_outdb-pre.sql b/raster/test/regress/loader/load_outdb-pre.sql
new file mode 100644
index 000000000..ddc631895
--- /dev/null
+++ b/raster/test/regress/loader/load_outdb-pre.sql
@@ -0,0 +1,43 @@
+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, (:'regdir' || '/../raster/test/regress/loader/testraster.tif')::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),
+ (:'regdir' || '/../raster/test/regress/loader/testraster.tif')::text, NULL::int[]
+ ) AS rast
+UNION ALL
+SELECT
+ 3 AS rid,
+ ST_AddBand( -- append out-db band 2
+ ST_AddBand( -- in-db band
+ ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0),
+ 1, '8BUI', 1, 0
+ ),
+ (:'regdir' || '/../raster/test/regress/loader/testraster.tif')::text, ARRAY[2]::int[]
+ ) AS rast
+UNION ALL
+SELECT
+ 4 AS rid,
+ ST_AddBand( -- append out-db band 2
+ ST_AddBand( -- in-db band
+ ST_MakeEmptyRaster(90, 50, 0., 0., 1, -1, 0, 0, 0),
+ 1, '8BUI', 1, 0
+ ),
+ (:'regdir' || '/../raster/test/regress/loader/testraster.tif')::text, ARRAY[2]::int[],
+ 1,
+ 255
+ ) AS rast
+
diff --git a/raster/test/regress/load_outdb.sql b/raster/test/regress/loader/load_outdb.sql
similarity index 100%
rename from raster/test/regress/load_outdb.sql
rename to raster/test/regress/loader/load_outdb.sql
diff --git a/raster/test/regress/loader/load_outdb.tif.ref b/raster/test/regress/loader/load_outdb.tif.ref
new file mode 100644
index 000000000..1e1cc0fc8
--- /dev/null
+++ b/raster/test/regress/loader/load_outdb.tif.ref
@@ -0,0 +1 @@
+testraster.tif
diff --git a/raster/test/regress/load_outdb_expected b/raster/test/regress/loader/load_outdb_expected
similarity index 100%
rename from raster/test/regress/load_outdb_expected
rename to raster/test/regress/loader/load_outdb_expected
diff --git a/raster/test/regress/tests.mk b/raster/test/regress/tests.mk
index 50d0c11ea..7dccaeb45 100644
--- a/raster/test/regress/tests.mk
+++ b/raster/test/regress/tests.mk
@@ -19,7 +19,7 @@ override RUNTESTFLAGS_INTERNAL := \
RASTER_TEST_FIRST = \
$(topsrcdir)/raster/test/regress/check_gdal \
- $(topsrcdir)/raster/test/regress/load_outdb
+ $(topsrcdir)/raster/test/regress/loader/load_outdb
RASTER_TEST_LAST = \
$(topsrcdir)/raster/test/regress/clean
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 2 +-
raster/test/regress/load_outdb-post.pl | 2 -
raster/test/regress/load_outdb-pre.pl | 69 ----------------------
raster/test/regress/loader/load_outdb-pre.sql | 43 ++++++++++++++
raster/test/regress/{ => loader}/load_outdb.sql | 0
.../loader/{Basic.tif.ref => load_outdb.tif.ref} | 0
.../test/regress/{ => loader}/load_outdb_expected | 0
raster/test/regress/tests.mk | 2 +-
8 files changed, 45 insertions(+), 73 deletions(-)
delete mode 100755 raster/test/regress/load_outdb-post.pl
delete mode 100755 raster/test/regress/load_outdb-pre.pl
create mode 100644 raster/test/regress/loader/load_outdb-pre.sql
rename raster/test/regress/{ => loader}/load_outdb.sql (100%)
copy raster/test/regress/loader/{Basic.tif.ref => load_outdb.tif.ref} (100%)
rename raster/test/regress/{ => loader}/load_outdb_expected (100%)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list