postgres.git / summary / log / commit / refs

commit    5d42a97519581a31bdc1d3d4cf10c07ae18b8296
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Fri May 05 04:29:49 2023 +0000
First released in: 16.0, 11.20, 12.15, 13.11, 14.8, 15.3

    Fix prove_installcheck when used with PGXS
    
    Commit 153e215677 added the portlock directory.  This is created in
    $ENV{top_builddir} if it is set.  Under PGXS, top_builddir points into
    the installation directory, which is not necessarily writable and in
    any case inappropriate to use by a test suite.  The cause of the
    problem is that the prove_installcheck target in Makefile.global
    exports top_builddir, which isn't useful (since no other Perl code
    actually reads it) and breaks this use case.  The reason this code is
    there is probably that is has been dragged around with various other
    changes, in particular a0fc813266, but without a real purpose of its
    own.  By just removing the exporting of top_builddir in
    prove_installcheck, the portlock directory then ends up under
    tmp_check in the build directory, which is more suitable.
    
    Reviewed-by: Andrew Dunstan <andrew@dunslane.net>
    Discussion: https://www.postgresql.org/message-id/78d1cfa6-0065-865d-584b-cde6d8c18aff@enterprisedb.com


 src/Makefile.global.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 772b91261d8..974b1dfef9e 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -464,7 +464,7 @@ cd $(srcdir) && \
    TESTLOGDIR='$(CURDIR)/tmp_check/log' \
    TESTDATADIR='$(CURDIR)/tmp_check' \
    PATH="$(bindir):$(CURDIR):$$PATH" \
-   PGPORT='6$(DEF_PGPORT)' top_builddir='$(top_builddir)' \
+   PGPORT='6$(DEF_PGPORT)' \
    PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' \
    $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
 endef


[parent: 57d0051706b8]