[postgis-tickets] [SCM] PostGIS branch out-of-tree-builds created. 3.2.0-314-g3280e794b

[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, out-of-tree-builds has been created
        at  3280e794ba4c6d4c3ac0ea308cf957b6aa68f712 (commit)

- Log -----------------------------------------------------------------
commit 3280e794ba4c6d4c3ac0ea308cf957b6aa68f712
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jan 20 14:29:24 2022 +0100

    Fix STAGED_INSTALL_DIR when POSTGIS_TOP_BUILD_DIR is given

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 3ef07ea65..21507a565 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -157,7 +157,7 @@ $ENV{"PGOPTIONS"} = $PGOPTIONS;
 my $PATH = $ENV{"PATH"}; # this is useless
 
 # Calculate the regression directory locations
-my $STAGED_INSTALL_DIR = $REGDIR . "/00-regress-install";
+my $STAGED_INSTALL_DIR = $TOP_BUILDDIR . "/regress/00-regress-install";
 my $STAGED_SCRIPTS_DIR = $STAGED_INSTALL_DIR . "/share/contrib/postgis";
 
 my $OBJ_COUNT_PRE = 0;

commit 9cfa28377bf071bd04c8a4263433e36a55848607
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jan 20 14:25:41 2022 +0100

    Fix regress tests of topology built out of tree

diff --git a/regress/runtest.mk b/regress/runtest.mk
index 6795bd1b8..888cb3e09 100644
--- a/regress/runtest.mk
+++ b/regress/runtest.mk
@@ -12,6 +12,7 @@
 
 abstopsrcdir := $(realpath $(top_srcdir))
 abssrcdir := $(realpath .)
+abs_top_builddir := $(realpath $(top_builddir))
 
 TESTS := $(patsubst $(topsrcdir)/%,$(abstopsrcdir)/%,$(TESTS))
 TESTS := $(patsubst $(abssrcdir)/%,./%,$(TESTS))
@@ -21,7 +22,7 @@ check-regress:
 	@echo "RUNTESTFLAGS: $(RUNTESTFLAGS)"
 	@echo "RUNTESTFLAGS_INTERNAL: $(RUNTESTFLAGS_INTERNAL)"
 
-	POSTGIS_TOP_BUILD_DIR=$(top_builddir) $(PERL) $(topsrcdir)/regress/run_test.pl $(RUNTESTFLAGS) $(RUNTESTFLAGS_INTERNAL) $(TESTS)
+	POSTGIS_TOP_BUILD_DIR=$(abs_top_builddir) $(PERL) $(topsrcdir)/regress/run_test.pl $(RUNTESTFLAGS) $(RUNTESTFLAGS_INTERNAL) $(TESTS)
 
 	@if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
 		echo "Running upgrade test as RUNTESTFLAGS did not contain that"; \
diff --git a/topology/test/Makefile.in b/topology/test/Makefile.in
index b1df1349b..1636c71c1 100644
--- a/topology/test/Makefile.in
+++ b/topology/test/Makefile.in
@@ -12,6 +12,7 @@
 
 top_srcdir = @top_srcdir@
 srcdir = @srcdir@
+top_builddir = @top_builddir@
 builddir = @builddir@
 
 DATABASE=postgis_topo_regress
@@ -19,6 +20,8 @@ DATABASE=postgis_topo_regress
 PSQL=psql
 PERL=@PERL@
 
+VPATH = $(srcdir)
+
 # MingW hack: rather than use PGSQL_BINDIR directly, we change to the directory and
 # then use "pwd" to return the path. This ensures that the returned path is in MSYS
 # format, otherwise colons in drive letters will break PATH.

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


hooks/post-receive
-- 
PostGIS