From e3eec3c8f8af72d3c85e217441009842e09ce1fc Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Sat, 7 Mar 2015 21:13:15 +0000 Subject: [PATCH 1/2] Make prove_check install contents t/extra if present This gives module developers the possibility to add a set of extensions and/or tools that will be available in the temporary installation of a given path, making them available for TAP test. --- src/Makefile.global.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 7c39d82..e856ca8 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -323,6 +323,8 @@ endef define prove_check $(MKDIR_P) tmp_check/log $(MAKE) -C $(top_builddir) DESTDIR='$(CURDIR)'/tmp_check/install install >'$(CURDIR)'/tmp_check/log/install.log 2>&1 +# Install extra set of test utilities if present +@if test -d $(CURDIR)/t/extra; then $(MAKE) -C $(CURDIR)/t/extra DESTDIR='$(CURDIR)'/tmp_check/install install >>'$(CURDIR)'/tmp_check/log/install.log 2>&1; fi 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 -- 2.3.1