git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Specify bindir in pg_isolation_regress_installcheck.

author Andres Freund <andres@anarazel.de>

2017年3月16日 02:03:29 +0000 (19:03 -0700)

committer Andres Freund <andres@anarazel.de>

2017年3月16日 02:03:29 +0000 (19:03 -0700)

It appears dcae5faccab64776376d3 forgot to add it to
pg_isolation_regress_installcheck, while it was added to
pg_regress_installcheck. It seems to so far have escaped notice,
because buildfarm animals requiring it, didn't actually use
pg_isolation_regress_installcheck anywhere - that changed with
60f826c5e6244, triggering failures on narwhal and frogmouth.

I've decided to not, for now at least, backpatch this, because the
relevant invocations look quite different in the back branches. Seems
quite possible that we'll want to backport 60f826c5e6244 as a whole if
it proves stable.

Discussion: https://postgr.es/m/20170315174003.3dyl4teashdwgblh@alap3.anarazel.de

src/Makefile.global.in patch | blob | blame | history

diff --git a/src/Makefile.global.in b/src/Makefile.global.in

index e7862016aa4ade6318cecae6f7d79fdc2da3b7b8..8e1d6e3bd4439f79e9811a1e30cf890bd64e79ee 100644 (file)

--- a/src/Makefile.global.in

+++ b/src/Makefile.global.in

@@ -552,23 +552,27 @@ pg_regress_check = \

$(top_builddir)/src/test/regress/pg_regress \

--temp-instance=./tmp_check \

--inputdir=$(srcdir) \

+ --bindir= \

$(TEMP_CONF) \

- --bindir= $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)

+ $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)

pg_regress_installcheck = \

$(top_builddir)/src/test/regress/pg_regress \

--inputdir=$(srcdir) \

- --bindir='$(bindir)' $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)

+ --bindir='$(bindir)' \

+ $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)

pg_isolation_regress_check = \

$(with_temp_install) \

$(top_builddir)/src/test/isolation/pg_isolation_regress \

--temp-instance=./tmp_check_iso \

--inputdir=$(srcdir) --outputdir=output_iso \

+ --bindir= \

$(TEMP_CONF) \

- --bindir= $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)

+ $(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)

pg_isolation_regress_installcheck = \

$(top_builddir)/src/test/isolation/pg_isolation_regress \

--inputdir=$(srcdir) \

+ --bindir='$(bindir)' \

$(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)

##########################################################################

This is the main PostgreSQL git repository.

RSS Atom