postgres.git / summary / log / commit / refs
commit 11aa362c89360aa5a044bd0b949b60ed4a5176bd
Author: Andrew Dunstan <andrew@dunslane.net>
Date: Sat Jun 10 14:19:06 2017 +0000
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.
src/Makefile.global.in | 2 +-
src/tools/msvc/vcregress.pl | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 8afc27bf0d3..9549c1bce92 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -335,7 +335,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 60a99f7ceb1..0006c4780d2 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -176,12 +176,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
[parent: b7665f079092]