[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc1-11-g0a627466b

[git at osgeo.org]

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  0a627466b1d414949488e22dcfe69b569cc533a7 (commit)
      from  556f868249c835984560630e598123fb4dea58a4 (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 0a627466b1d414949488e22dcfe69b569cc533a7
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Aug 13 10:26:41 2022 +0200

    Add --build-dir switch to run_test.pl

diff --git a/regress/run_test.pl b/regress/run_test.pl
index aea1799f7..0d3dfee79 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -51,9 +51,6 @@ BEGIN {
 our $DB = $ENV{"POSTGIS_REGRESS_DB"} || "postgis_reg";
 our $REGDIR = abs_path(dirname($0));
 our $TOP_BUILDDIR = $ENV{"POSTGIS_TOP_BUILD_DIR"} || ${REGDIR} . '/..';
-our $SHP2PGSQL = $TOP_BUILDDIR . "/loader/shp2pgsql";
-our $PGSQL2SHP = $TOP_BUILDDIR . "/loader/pgsql2shp";
-our $RASTER2PGSQL = $TOP_BUILDDIR . "/raster/loader/raster2pgsql";
 our $sysdiff = !system("diff --strip-trailing-cr $0 $0 2> /dev/null");
 
 ##################################################################
@@ -97,6 +94,7 @@ GetOptions (
 	'expect' => \$OPT_EXPECT,
 	'extensions' => \$OPT_EXTENSIONS,
 	'schema=s' => \$OPT_SCHEMA,
+	'build-dir=s' => \$TOP_BUILDDIR,
 	'after-create-script=s' => \@OPT_HOOK_AFTER_CREATE,
 	'before-uninstall-script=s' => \@OPT_HOOK_BEFORE_UNINSTALL,
 	'before-upgrade-script=s' => \@OPT_HOOK_BEFORE_UPGRADE,
@@ -108,6 +106,10 @@ if ( @ARGV < 1 )
 	usage();
 }
 
+our $SHP2PGSQL = $TOP_BUILDDIR . "/loader/shp2pgsql";
+our $PGSQL2SHP = $TOP_BUILDDIR . "/loader/pgsql2shp";
+our $RASTER2PGSQL = $TOP_BUILDDIR . "/raster/loader/raster2pgsql";
+
 if ( $OPT_UPGRADE_PATH )
 {
   $OPT_UPGRADE = 1; # implied
@@ -177,7 +179,8 @@ foreach my $exec ( ($SHP2PGSQL, $PGSQL2SHP) )
 	{
 		print "failed\n";
 		print STDERR "Unable to find $exec executable.\n";
-		die "HINT: set POSTGIS_TOP_BUILD_DIR env variable to the build dir.\n";
+		print STDERR "TOP_BUILDDIR is ${TOP_BUILDDIR}\n";
+		die "HINT: use POSTGIS_TOP_BUILD_DIR env or --build-dir switch the specify top build dir.\n";
 	}
 
 }
@@ -592,6 +595,9 @@ Options:
   --clean         cleanup test logs on exit
   --expect        save obtained output as expected
   --extension     load using extensions
+  --build-dir <path>
+                  specify where to find the top build dir of PostGIS,
+                  to find binaries and scripts
   --after-create-script <path>
                   script to load after spatial db creation
                   (multiple switches supported, to be run in given order)

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

Summary of changes:
 regress/run_test.pl | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
PostGIS