Take PROVE_FLAGS from the command line but not the environment

This reverts commit 56b6ef893fee9e9bf47d927a02f4d1ea911f4d9c and instead
makes vcregress.pl parse out PROVE_FLAGS from a command line argument
when doing a TAP test, thus making it consistent with the makefile
treatment.

Discussion: https://postgr.es/m/c26a7416-2fb9-34ab-7991-618c922f896e%402ndquadrant.com

Backpatch to 9.4 like previous patch.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 1c9fc2bb87c6978e45b70f6a5ca45775fe6d80ed..8ac7ca7d2bf729721b95a5e1f6e861c162663ecc 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -336,7 +336,7 @@ PROVE = @PROVE@
 # extra perl modules in their own directory.
 PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/ -I $(srcdir)
 # User-supplied prove flags such as --verbose can be provided in PROVE_FLAGS.
-
+PROVE_FLAGS =
 
 # prepend to path if already set, else just set it
 define add_to_path

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index dc976d00729dd2e58058fee5bef75f52b0bfe95b..3acb9c0ee872e895847c3df0716299edf568dbc7 100644 (file)
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -177,12 +177,18 @@ sub tap_check
        die "Tap tests not enabled in configuration"
          unless $config->{tap_tests};
 
+       my @flags;
+       foreach my $arg (0 .. scalar(@_))
+       {
+               next unless $_[$arg] =~ /^PROVE_FLAGS=(.*)/;
+               @flags = split(/\s+/, $1);
+               splice(@_,$arg,1);
+               last;
+       }
+
        my $dir = shift;
        chdir $dir;
 
-       my @flags;
-       @flags = split(/\s+/,$ENV{PROVE_FLAGS}) if exists $ENV{PROVE_FLAGS};
-
        my @args = ("prove", @flags, "t/*.pl");
 
        # adjust the environment for just this test