* Andrew Dunstan (and...@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 attached seems to fix it. Would be great to get feedback on it as I'm no Makefile expert (it took me far too long to run down what was happening and work out what seemed like the right fix..). Thanks! Stephen
From 79630d53ff16499651a10ade78372c301052306c Mon Sep 17 00:00:00 2001 From: Stephen Frost <sfr...@snowman.net> Date: Tue, 8 Sep 2015 14:18:49 -0400 Subject: [PATCH] Add temp-check, with_temp_install definition - 9.4 Commit fa4a4df93c8c28d5684cacb1677fbd13f58bb9f2 attempted to backpatch to 9.4 a change to improve the logging of TAP tests. Unfortunately, due to how 9.4 and 9.5 had diverged, the backpatch to 9.4 depended on a few things which didn't exist in 9.4 (but did in 9.5), specifically, the 'temp-check' production and the 'with_temp_install' definition (which also required 'abs_top_builddir'). Add these definitions into REL9_4_STABLE to allow the TAP tests to run correctly under 'make check'. --- src/Makefile.global.in | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 13d4aa3..bea05ad 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -59,6 +59,7 @@ endif endif else # not PGXS vpath_build = @vpath_build@ +abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ifneq ($(vpath_build),yes) @@ -316,6 +317,19 @@ BZIP2 = bzip2 # Testing +check: temp-install + +.PHONY: temp-install +temp-install: +ifndef NO_TEMP_INSTALL +ifeq ($(MAKELEVEL),0) + rm -rf '$(abs_top_builddir)'/tmp_install + $(MKDIR_P) '$(abs_top_builddir)'/tmp_install/log + $(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1 +endif + $(if $(EXTRA_INSTALL),for extra in $(EXTRA_INSTALL); do $(MAKE) -C '$(top_builddir)'/$$extra DESTDIR='$(abs_top_builddir)'/tmp_install install >>'$(abs_top_builddir)'/tmp_install/log/install.log || exit; done) +endif + PROVE = @PROVE@ PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/ PROVE_FLAGS = --verbose @@ -330,6 +344,10 @@ define ld_library_path_var $(if $(filter $(PORTNAME),darwin),DYLD_LIBRARY_PATH,$(if $(filter $(PORTNAME),aix),LIBPATH,LD_LIBRARY_PATH)) endef +define with_temp_install +PATH="$(abs_top_builddir)/tmp_install$(bindir):$$PATH" $(call add_to_path,$(ld_library_path_var),$(abs_top_builddir)/tmp_install$(libdir)) +endef + ifeq ($(enable_tap_tests),yes) define prove_installcheck -- 1.9.1
signature.asc
Description: Digital signature
