aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2016-10-07 21:48:21 +0300
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2016-10-07 21:49:49 +0300
commitd668b03378c28b927d0ba458681ca1b4c1e18e53 (patch)
treeef286956562b7344b8bab439a4a3932a5010ea30
parent17a3a1eb0efc5d84c81e46a26fe6bd21dbe90de9 (diff)
downloadpostgresql-d668b03378c28b927d0ba458681ca1b4c1e18e53.tar.gz
postgresql-d668b03378c28b927d0ba458681ca1b4c1e18e53.zip
Make TAP test suites to work, when @INC does not contain current dir.
Recent Perl and/or new Linux distributions are starting to remove "." from the @INC list by default. That breaks pg_rewind and ssl test suites, which use helper perl modules that reside in the same directory. To fix, add the current source directory explicitly to prove's include dir. The vcregress.pl script probably also needs something like this, but I wasn't able to remove '.' from @INC on Windows to test this, and don't want to try doing that blindly. Discussion: <20160908204529.flg6nivjuwp5vaoy@alap3.anarazel.de>
-rw-r--r--src/Makefile.global.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index c211a2d2e75..e1e2c0adaf2 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -332,7 +332,9 @@ endif
endif
PROVE = @PROVE@
-PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/
+# There are common routines in src/test/perl, and some test suites have
+# extra perl modules in their own directory.
+PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/ -I $(srcdir)
PROVE_FLAGS = --verbose
# prepend to path if already set, else just set it