Specify bindir in pg_isolation_regress_installcheck.
It appearsdcae5facca
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 with60f826c5e6
, 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 backport60f826c5e6
as a whole if it proves stable. Discussion: https://postgr.es/m/20170315174003.3dyl4teashdwgblh@alap3.anarazel.de
This commit is contained in:
parent
bd1827c7c9
commit
2038bf41c9
|
@ -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)
|
||||
|
||||
##########################################################################
|
||||
|
|
Loading…
Reference in New Issue