From d6f4eea7ee41a1d2ab0335bd126bf2cca7017cdd Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Fri, 7 Oct 2016 14:40:43 +0300 Subject: [PATCH 1/1] Make TAP test suites to work, when @INC does not contain current dir. Perl and/or new Linux distributions are starting to remove "." from the @INC list by default. That breaks the pg_rewind and ssl test suites, which use helper perl modules that reside in the same directory. To fix, add the correct directory explicitly to prove's include dir. --- src/bin/pg_rewind/Makefile | 2 ++ src/test/ssl/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/bin/pg_rewind/Makefile b/src/bin/pg_rewind/Makefile index d03a0a2..af4a800 100644 --- a/src/bin/pg_rewind/Makefile +++ b/src/bin/pg_rewind/Makefile @@ -18,6 +18,8 @@ include $(top_builddir)/src/Makefile.global PG_CPPFLAGS = -I$(libpq_srcdir) PG_LIBS = $(libpq_pgport) +PG_PROVE_FLAGS += -I$(top_srcdir)/$(subdir) + override CPPFLAGS := -I$(libpq_srcdir) -DFRONTEND $(CPPFLAGS) OBJS = pg_rewind.o parsexlog.o xlogreader.o datapagemap.o timeline.o \ diff --git a/src/test/ssl/Makefile b/src/test/ssl/Makefile index 2b04d82..c65791c 100644 --- a/src/test/ssl/Makefile +++ b/src/test/ssl/Makefile @@ -13,6 +13,8 @@ subdir = src/test/ssl top_builddir = ../../.. include $(top_builddir)/src/Makefile.global +PG_PROVE_FLAGS += -I$(top_srcdir)/$(subdir) + CERTIFICATES := server_ca server-cn-and-alt-names \ server-cn-only server-single-alt-name server-multiple-alt-names \ server-no-names server-revoked server-ss \ -- 2.9.3