[postgis-tickets] [SCM] PostGIS branch raster-regress-no-race updated. 3.2.0-386-g1090436f1
git at osgeo.org
git at osgeo.org
Thu Jan 27 10:56:26 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, raster-regress-no-race has been updated
discards 05948601d817a9ab4132e32f0c9b14fe46d1d37f (commit)
via 1090436f14fa3641834df6540fa2a4f35dbb8c3f (commit)
via ad7e344f843347a3bdf7eba9ffd2c2ec3776e6fe (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (05948601d817a9ab4132e32f0c9b14fe46d1d37f)
\
N -- N -- N (1090436f14fa3641834df6540fa2a4f35dbb8c3f)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 1090436f14fa3641834df6540fa2a4f35dbb8c3f
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 27 19:21:48 2022 +0100
Replace pre/post machinery of rasters with .tif.ref files
Closes #5068
diff --git a/raster/test/regress/loader/Basic-post.pl b/raster/test/regress/loader/Basic-post.pl
deleted file mode 100755
index 6da894565..000000000
--- a/raster/test/regress/loader/Basic-post.pl
+++ /dev/null
@@ -1 +0,0 @@
-unlink $TEST . ".tif";
diff --git a/raster/test/regress/loader/Basic-pre.pl b/raster/test/regress/loader/Basic-pre.pl
deleted file mode 100755
index 98185b959..000000000
--- a/raster/test/regress/loader/Basic-pre.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-my $TARGETFILE = $TEST . '.tif';
-
-if ( ! -e $TARGETFILE ) {
- my $FILERASTER = dirname($TEST) . "/testraster.tif";
- link ("$FILERASTER", "$TARGETFILE") ||
- die("Cannot link $FILERASTER to $TARGETFILE: $!");
-}
-
-1;
diff --git a/raster/test/regress/loader/Basic.tif.ref b/raster/test/regress/loader/Basic.tif.ref
new file mode 100644
index 000000000..1e1cc0fc8
--- /dev/null
+++ b/raster/test/regress/loader/Basic.tif.ref
@@ -0,0 +1 @@
+testraster.tif
diff --git a/raster/test/regress/loader/BasicCopy-post.pl b/raster/test/regress/loader/BasicCopy-post.pl
deleted file mode 100755
index 6da894565..000000000
--- a/raster/test/regress/loader/BasicCopy-post.pl
+++ /dev/null
@@ -1 +0,0 @@
-unlink $TEST . ".tif";
diff --git a/raster/test/regress/loader/BasicCopy-pre.pl b/raster/test/regress/loader/BasicCopy-pre.pl
deleted file mode 100755
index 98185b959..000000000
--- a/raster/test/regress/loader/BasicCopy-pre.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-my $TARGETFILE = $TEST . '.tif';
-
-if ( ! -e $TARGETFILE ) {
- my $FILERASTER = dirname($TEST) . "/testraster.tif";
- link ("$FILERASTER", "$TARGETFILE") ||
- die("Cannot link $FILERASTER to $TARGETFILE: $!");
-}
-
-1;
diff --git a/raster/test/regress/loader/BasicCopy.tif.ref b/raster/test/regress/loader/BasicCopy.tif.ref
new file mode 100644
index 000000000..1e1cc0fc8
--- /dev/null
+++ b/raster/test/regress/loader/BasicCopy.tif.ref
@@ -0,0 +1 @@
+testraster.tif
diff --git a/raster/test/regress/loader/BasicFilename-post.pl b/raster/test/regress/loader/BasicFilename-post.pl
deleted file mode 100755
index 6da894565..000000000
--- a/raster/test/regress/loader/BasicFilename-post.pl
+++ /dev/null
@@ -1 +0,0 @@
-unlink $TEST . ".tif";
diff --git a/raster/test/regress/loader/BasicFilename-pre.pl b/raster/test/regress/loader/BasicFilename-pre.pl
deleted file mode 100755
index 98185b959..000000000
--- a/raster/test/regress/loader/BasicFilename-pre.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-my $TARGETFILE = $TEST . '.tif';
-
-if ( ! -e $TARGETFILE ) {
- my $FILERASTER = dirname($TEST) . "/testraster.tif";
- link ("$FILERASTER", "$TARGETFILE") ||
- die("Cannot link $FILERASTER to $TARGETFILE: $!");
-}
-
-1;
diff --git a/raster/test/regress/loader/BasicFilename.select.expected b/raster/test/regress/loader/BasicFilename.select.expected
index abc84600b..aac51f136 100644
--- a/raster/test/regress/loader/BasicFilename.select.expected
+++ b/raster/test/regress/loader/BasicFilename.select.expected
@@ -2,4 +2,4 @@
POLYGON((0 0,1 0,1 -1,0 -1,0 0))|255
POLYGON((89 -49,90 -49,90 -50,89 -50,89 -49))|0
POLYGON((44 -24,45 -24,45 -25,44 -25,44 -24))|0
-BasicFilename.tif
+testraster.tif
diff --git a/raster/test/regress/loader/BasicFilename.tif.ref b/raster/test/regress/loader/BasicFilename.tif.ref
new file mode 100644
index 000000000..1e1cc0fc8
--- /dev/null
+++ b/raster/test/regress/loader/BasicFilename.tif.ref
@@ -0,0 +1 @@
+testraster.tif
diff --git a/raster/test/regress/loader/BasicOutDB-post.pl b/raster/test/regress/loader/BasicOutDB-post.pl
deleted file mode 100755
index 695bf143b..000000000
--- a/raster/test/regress/loader/BasicOutDB-post.pl
+++ /dev/null
@@ -1,2 +0,0 @@
-unlink $TEST . ".tif";
-unlink $TEST . ".opts";
diff --git a/raster/test/regress/loader/BasicOutDB-pre.pl b/raster/test/regress/loader/BasicOutDB-pre.pl
deleted file mode 100755
index 0fcd7eb3f..000000000
--- a/raster/test/regress/loader/BasicOutDB-pre.pl
+++ /dev/null
@@ -1,16 +0,0 @@
-use File::Basename;
-use Cwd 'abs_path';
-
-my $TARGETFILE = $TEST . '.tif';
-
-my $FILERASTER = abs_path(dirname($TEST)) . "/testraster.tif";
-
-if ( ! -e $TARGETFILE ) {
- link ("$FILERASTER", "$TARGETFILE") ||
- die("Cannot link $FILERASTER to $TARGETFILE: $!");
-}
-
-my $OPTSFNAME = $TEST . '.opts';
-open(OPTS, '>', $OPTSFNAME) || die ('Cannot open ' . $OPTSFNAME. ": $1");
-print OPTS "-F -C -R \"$FILERASTER\"\n";
-close(OPTS);
diff --git a/raster/test/regress/loader/BasicOutDB.opts b/raster/test/regress/loader/BasicOutDB.opts
new file mode 100644
index 000000000..08682960f
--- /dev/null
+++ b/raster/test/regress/loader/BasicOutDB.opts
@@ -0,0 +1 @@
+-F -C -R {regdir}/testraster.tif
diff --git a/raster/test/regress/loader/BasicOutDB.tif.ref b/raster/test/regress/loader/BasicOutDB.tif.ref
new file mode 100644
index 000000000..1e1cc0fc8
--- /dev/null
+++ b/raster/test/regress/loader/BasicOutDB.tif.ref
@@ -0,0 +1 @@
+testraster.tif
diff --git a/raster/test/regress/loader/Tiled10x10-post.pl b/raster/test/regress/loader/Tiled10x10-post.pl
deleted file mode 100755
index 6da894565..000000000
--- a/raster/test/regress/loader/Tiled10x10-post.pl
+++ /dev/null
@@ -1 +0,0 @@
-unlink $TEST . ".tif";
diff --git a/raster/test/regress/loader/Tiled10x10-pre.pl b/raster/test/regress/loader/Tiled10x10-pre.pl
deleted file mode 100755
index 98185b959..000000000
--- a/raster/test/regress/loader/Tiled10x10-pre.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-my $TARGETFILE = $TEST . '.tif';
-
-if ( ! -e $TARGETFILE ) {
- my $FILERASTER = dirname($TEST) . "/testraster.tif";
- link ("$FILERASTER", "$TARGETFILE") ||
- die("Cannot link $FILERASTER to $TARGETFILE: $!");
-}
-
-1;
diff --git a/raster/test/regress/loader/Tiled10x10.tif.ref b/raster/test/regress/loader/Tiled10x10.tif.ref
new file mode 100644
index 000000000..1e1cc0fc8
--- /dev/null
+++ b/raster/test/regress/loader/Tiled10x10.tif.ref
@@ -0,0 +1 @@
+testraster.tif
diff --git a/raster/test/regress/loader/Tiled10x10Copy-post.pl b/raster/test/regress/loader/Tiled10x10Copy-post.pl
deleted file mode 100755
index 6da894565..000000000
--- a/raster/test/regress/loader/Tiled10x10Copy-post.pl
+++ /dev/null
@@ -1 +0,0 @@
-unlink $TEST . ".tif";
diff --git a/raster/test/regress/loader/Tiled10x10Copy-pre.pl b/raster/test/regress/loader/Tiled10x10Copy-pre.pl
deleted file mode 100755
index 98185b959..000000000
--- a/raster/test/regress/loader/Tiled10x10Copy-pre.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-my $TARGETFILE = $TEST . '.tif';
-
-if ( ! -e $TARGETFILE ) {
- my $FILERASTER = dirname($TEST) . "/testraster.tif";
- link ("$FILERASTER", "$TARGETFILE") ||
- die("Cannot link $FILERASTER to $TARGETFILE: $!");
-}
-
-1;
diff --git a/raster/test/regress/loader/Tiled10x10Copy.tif.ref b/raster/test/regress/loader/Tiled10x10Copy.tif.ref
new file mode 100644
index 000000000..1e1cc0fc8
--- /dev/null
+++ b/raster/test/regress/loader/Tiled10x10Copy.tif.ref
@@ -0,0 +1 @@
+testraster.tif
diff --git a/raster/test/regress/loader/Tiled8x8-post.pl b/raster/test/regress/loader/Tiled8x8-post.pl
deleted file mode 100755
index 6da894565..000000000
--- a/raster/test/regress/loader/Tiled8x8-post.pl
+++ /dev/null
@@ -1 +0,0 @@
-unlink $TEST . ".tif";
diff --git a/raster/test/regress/loader/Tiled8x8-pre.pl b/raster/test/regress/loader/Tiled8x8-pre.pl
deleted file mode 100755
index 98185b959..000000000
--- a/raster/test/regress/loader/Tiled8x8-pre.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-my $TARGETFILE = $TEST . '.tif';
-
-if ( ! -e $TARGETFILE ) {
- my $FILERASTER = dirname($TEST) . "/testraster.tif";
- link ("$FILERASTER", "$TARGETFILE") ||
- die("Cannot link $FILERASTER to $TARGETFILE: $!");
-}
-
-1;
diff --git a/raster/test/regress/loader/Tiled8x8.tif.ref b/raster/test/regress/loader/Tiled8x8.tif.ref
new file mode 100644
index 000000000..1e1cc0fc8
--- /dev/null
+++ b/raster/test/regress/loader/Tiled8x8.tif.ref
@@ -0,0 +1 @@
+testraster.tif
diff --git a/raster/test/regress/loader/TiledAuto-post.pl b/raster/test/regress/loader/TiledAuto-post.pl
deleted file mode 100755
index 6da894565..000000000
--- a/raster/test/regress/loader/TiledAuto-post.pl
+++ /dev/null
@@ -1 +0,0 @@
-unlink $TEST . ".tif";
diff --git a/raster/test/regress/loader/TiledAuto-pre.pl b/raster/test/regress/loader/TiledAuto-pre.pl
deleted file mode 100755
index c01569b80..000000000
--- a/raster/test/regress/loader/TiledAuto-pre.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-my $TARGETFILE = $TEST . '.tif';
-
-if ( ! -e $TARGETFILE ) {
- my $FILERASTER = dirname($TEST) . "/testraster2.tif";
- link ("$FILERASTER", "$TARGETFILE") ||
- die("Cannot link $FILERASTER to $TARGETFILE: $!");
-}
-
-1;
diff --git a/raster/test/regress/loader/TiledAuto.tif.ref b/raster/test/regress/loader/TiledAuto.tif.ref
new file mode 100644
index 000000000..a7c066dc8
--- /dev/null
+++ b/raster/test/regress/loader/TiledAuto.tif.ref
@@ -0,0 +1 @@
+testraster2.tif
diff --git a/raster/test/regress/loader/TiledAutoSkipNoData-post.pl b/raster/test/regress/loader/TiledAutoSkipNoData-post.pl
deleted file mode 100755
index 6da894565..000000000
--- a/raster/test/regress/loader/TiledAutoSkipNoData-post.pl
+++ /dev/null
@@ -1 +0,0 @@
-unlink $TEST . ".tif";
diff --git a/raster/test/regress/loader/TiledAutoSkipNoData-pre.pl b/raster/test/regress/loader/TiledAutoSkipNoData-pre.pl
deleted file mode 100755
index c01569b80..000000000
--- a/raster/test/regress/loader/TiledAutoSkipNoData-pre.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-my $TARGETFILE = $TEST . '.tif';
-
-if ( ! -e $TARGETFILE ) {
- my $FILERASTER = dirname($TEST) . "/testraster2.tif";
- link ("$FILERASTER", "$TARGETFILE") ||
- die("Cannot link $FILERASTER to $TARGETFILE: $!");
-}
-
-1;
diff --git a/raster/test/regress/loader/TiledAutoSkipNoData.tif.ref b/raster/test/regress/loader/TiledAutoSkipNoData.tif.ref
new file mode 100644
index 000000000..a7c066dc8
--- /dev/null
+++ b/raster/test/regress/loader/TiledAutoSkipNoData.tif.ref
@@ -0,0 +1 @@
+testraster2.tif
commit ad7e344f843347a3bdf7eba9ffd2c2ec3776e6fe
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 27 19:54:37 2022 +0100
run_test.pl: support {regdir} label in .opts raster files
diff --git a/regress/run_test.pl b/regress/run_test.pl
index c139e7f2d..444ee7207 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -1255,11 +1255,16 @@ sub run_raster_loader_test
if ( -r $opts_file )
{
+ my $regdir = abs_path(dirname(${TEST}));
open(FILE, $opts_file);
- my @opts = <FILE>;
+ my @opts;
+ while (<FILE>) {
+ next if /^\s*#/;
+ chop;
+ s/{regdir}/$regdir/;
+ push @opts, $_;
+ }
close(FILE);
- @opts = grep(!/^\s*#/, @opts);
- map(s/\n//, @opts);
$custom_opts = join(" ", @opts);
}
-----------------------------------------------------------------------
Summary of changes:
raster/test/regress/loader/BasicOutDB-post.pl | 2 --
raster/test/regress/loader/BasicOutDB-pre.pl | 16 ----------------
raster/test/regress/loader/BasicOutDB.opts | 1 +
.../regress/loader/{Basic.tif.ref => BasicOutDB.tif.ref} | 0
regress/run_test.pl | 11 ++++++++---
5 files changed, 9 insertions(+), 21 deletions(-)
delete mode 100755 raster/test/regress/loader/BasicOutDB-post.pl
delete mode 100755 raster/test/regress/loader/BasicOutDB-pre.pl
create mode 100644 raster/test/regress/loader/BasicOutDB.opts
copy raster/test/regress/loader/{Basic.tif.ref => BasicOutDB.tif.ref} (100%)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list