Noah,
* Noah Misch (noah@leadboat.com) wrote:
> On Tue, Sep 08, 2015 at 02:58:36PM -0400, Stephen Frost wrote:
> > * Andrew Dunstan (andrew@dunslane.net) wrote:
> > > Improve logging of TAP tests.
> >
> > [...]
> >
> > This broke 'make check' for REL9_4_STABLE with --enable-tap-tests
> > because it added a reference to 'with_temp_install' but didn't actually
> > define it.
>
> The corresponding commits for HEAD (1ea0620) and 9.5 (fa4a4df) added just an
> "rm" invocation to that Makefile. Commit ef57b98 had no occasion to do more;
> I suspect a merge accident. Best to revert the extra change:
>
> --- a/src/Makefile.global.in
> +++ b/src/Makefile.global.in
> @@ -357,5 +357,7 @@ endef
> define prove_check
> rm -rf $(CURDIR)/tmp_check/log
> -cd $(srcdir) && TESTDIR='$(CURDIR)' $(with_temp_install) PGPORT='6$(DEF_PGPORT)'
top_builddir='$(CURDIR)/$(top_builddir)'$(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) t/*.pl
> +$(MKDIR_P) tmp_check/log
> +$(MAKE) -C $(top_builddir) DESTDIR='$(CURDIR)'/tmp_check/install install >'$(CURDIR)'/tmp_check/log/install.log 2>&1
> +cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(CURDIR)/tmp_check/install$(bindir):$$PATH" $(call
add_to_path,$(ld_library_path_var),$(CURDIR)/tmp_check/install$(libdir))top_builddir='$(CURDIR)/$(top_builddir)'
PGPORT='6$(DEF_PGPORT)'$(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) t/*.pl
> endef
Yup, reverting mine and applying the above appears to work based on my
testing.
Patch attached for review. Barring objections, I'll commit this in a
few hours.
Thanks!
Stephen