Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5d42a97

Browse files
committed
Fix prove_installcheck when used with PGXS
Commit 153e215 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 a0fc813, 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
1 parent 57d0051 commit 5d42a97

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Makefile.global.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ cd $(srcdir) && \
464464
TESTLOGDIR='$(CURDIR)/tmp_check/log' \
465465
TESTDATADIR='$(CURDIR)/tmp_check' \
466466
PATH="$(bindir):$(CURDIR):$$PATH" \
467-
PGPORT='6$(DEF_PGPORT)' top_builddir='$(top_builddir)' \
467+
PGPORT='6$(DEF_PGPORT)' \
468468
PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' \
469469
$(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
470470
endef

0 commit comments

Comments
 (0)