[postgis-tickets] [SCM] PostGIS branch raster-regress-no-race created. 3.2.0-385-g05948601d
git at osgeo.org
git at osgeo.org
Thu Jan 27 10:32:28 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 created
at 05948601d817a9ab4132e32f0c9b14fe46d1d37f (commit)
- Log -----------------------------------------------------------------
commit 05948601d817a9ab4132e32f0c9b14fe46d1d37f
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
References #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/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 31433f286246fce41f8face64aba443a92235a9f
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 27 19:15:28 2022 +0100
run_test.pl: add support for .tif.ref files
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 475928e0a..c139e7f2d 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -445,7 +445,20 @@ foreach $TEST (@ARGV)
}
elsif ( -r "${TEST}.tif" )
{
- my $rv = run_raster_loader_test();
+ my $rv = run_raster_loader_test("${TEST}.tif");
+ pass("in ".int(1000*(time-$TEST_START_TIME))." ms") if $rv;
+ }
+ elsif ( -r "${TEST}.tif.ref" )
+ {
+ open(REF, "${TEST}.tif.ref");
+ my $raster_ref = <REF>;
+ close(REF);
+ chop $raster_ref;
+ #print "Raster ref: [$raster_ref]\n";
+ # Resolve raster_ref relative to ${TEST} dirname
+ my $raster_path = dirname(${TEST}) . '/' . $raster_ref;
+ #print "Raster path: [$raster_path]\n";
+ my $rv = run_raster_loader_test($raster_path);
pass("in ".int(1000*(time-$TEST_START_TIME))." ms") if $rv;
}
elsif ( -r "${TEST}.sql" )
@@ -983,6 +996,7 @@ sub run_dumper_and_check_output
sub run_raster_loader_and_check_output
{
my $description = shift;
+ my $raster_file = shift;
my $tblname = shift;
my $expected_sql_file = shift;
my $expected_select_results_file = shift;
@@ -1001,7 +1015,7 @@ sub run_raster_loader_and_check_output
show_progress();
# Produce the output SQL file.
- $cmd = "$RASTER2PGSQL $loader_options ${TEST}.tif $tblname > $outfile 2> $errfile";
+ $cmd = "$RASTER2PGSQL $loader_options $raster_file $tblname > $outfile 2> $errfile";
$rv = system($cmd);
if ( $rv )
@@ -1234,6 +1248,7 @@ sub run_dumper_test
##################################################################
sub run_raster_loader_test
{
+ my $raster_file = shift;
# See if there is a custom command-line options file
my $opts_file = "${TEST}.opts";
my $custom_opts="";
@@ -1251,7 +1266,7 @@ sub run_raster_loader_test
my $tblname="loadedrast";
# If we have some expected files to compare with, run in geography mode.
- if ( ! run_raster_loader_and_check_output("test", $tblname, "${TEST}.sql.expected", "${TEST}.select.expected", $custom_opts, "true") )
+ if ( ! run_raster_loader_and_check_output("test", $raster_file, $tblname, "${TEST}.sql.expected", "${TEST}.select.expected", $custom_opts, "true") )
{
return 0;
}
-----------------------------------------------------------------------
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list