diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2023-05-05 06:29:49 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2023-05-05 07:10:30 +0200 |
| commit | e0702250040437e314779babcc417d7448a1f017 (patch) | |
| tree | 47947d2791e4e2606614fa2d4dd00faec32d29f7 | |
| parent | 52c9cf3239b85f272d928db178d44947c9173d76 (diff) | |
| download | postgresql-e0702250040437e314779babcc417d7448a1f017.tar.gz postgresql-e0702250040437e314779babcc417d7448a1f017.zip | |
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
| -rw-r--r-- | src/Makefile.global.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 77350ceeebd..1891d957fae 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -460,7 +460,7 @@ rm -rf '$(CURDIR)'/tmp_check $(MKDIR_P) '$(CURDIR)'/tmp_check cd $(srcdir) && \ TESTDIR='$(CURDIR)' 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 |