aboutsummaryrefslogtreecommitdiff
path: root/src
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 22:00:24 +0300
commit00d7e2f8c8b0def5cb3dcb0cae4cfca10dc4876f (patch)
tree66318ba57b37e7b6bfbfb320151f7500f9c003cf /src
parent010a1b5614cc6a26b35ea04ba85271baa0e929ac (diff)
downloadpostgresql-00d7e2f8c8b0def5cb3dcb0cae4cfca10dc4876f.tar.gz
postgresql-00d7e2f8c8b0def5cb3dcb0cae4cfca10dc4876f.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>
Diffstat (limited to 'src')
-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 68252fd37e4..6930f2f609d 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -331,7 +331,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