[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-688-g5e8783b89

git at osgeo.org git at osgeo.org
Tue Oct 17 05:56:30 PDT 2023


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  5e8783b89cb989c06e9b57a1ecf85a905c05f23e (commit)
      from  194b27a856b63a7b7ad8a8353788b5480b5cc51c (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 5e8783b89cb989c06e9b57a1ecf85a905c05f23e
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Oct 17 14:56:14 2023 +0200

    run_test.pl: make a guess at where build tree may be

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 6424a2bdc..11d0dabf6 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -51,7 +51,7 @@ our $DB = $ENV{"POSTGIS_REGRESS_DB"} || "postgis_reg";
 our $REGDIR = $ENV{"POSTGIS_REGRESS_DIR"} || abs_path(dirname($0));
 our $TOP_SOURCEDIR = ${REGDIR} . '/..';
 our $ABS_TOP_SOURCEDIR = abs_path(${TOP_SOURCEDIR});
-our $TOP_BUILDDIR = $ENV{"POSTGIS_TOP_BUILD_DIR"} || ${TOP_SOURCEDIR};
+our $TOP_BUILDDIR = $ENV{"POSTGIS_TOP_BUILD_DIR"};
 our $sysdiff = !system("diff --strip-trailing-cr $0 $0 2> /dev/null");
 
 ##################################################################
@@ -148,6 +148,20 @@ sub findOrDie
     die "HINT: use POSTGIS_TOP_BUILD_DIR env or --build-dir switch the specify top build dir.\n";
 }
 
+
+# If build dir is not given, try to guess
+if ( "${TOP_BUILDDIR}" eq "" )
+{
+    foreach my $d ( $ENV{'PWD'}, "${TOP_SOURCEDIR}" )
+    {
+        if ( -e ${d} . '/postgis_revision.h' )
+        {
+            $TOP_BUILDDIR="${d}";
+            last;
+        }
+    }
+}
+
 # Prepend scripts' build dirs to path
 # TODO: make this conditional ?
 $ENV{PATH} = $TOP_BUILDDIR . '/loader:' .

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

Summary of changes:
 regress/run_test.pl | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list