postgres.git / summary / log / commit / refs

commit    56b6ef893fee9e9bf47d927a02f4d1ea911f4d9c
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Fri May 12 15:11:49 2017 +0000

    Honor PROVE_FLAGS environment setting
    
    On MSVC builds and on back branches that means removing the hardcoded
    --verbose setting. On master for Unix that means removing the empty
    setting in the global Makefile so that the value can be acquired from
    the environment as well as from the make arguments.
    
    Backpatch to 9.4 where we introduced TAP tests


 src/Makefile.global.in      | 4 ++--
 src/tools/msvc/vcregress.pl | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index b83f09f3264..dfbd2ae892f 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -339,8 +339,8 @@ PROVE = @PROVE@
 # 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)
-# For more info, add to your make line: PROVE_FLAGS='--verbose'
-PROVE_FLAGS =
+# User-supplied prove flags such as --verbose can be provided in 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 2d16db07e23..830be2ba055 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -181,7 +181,10 @@ sub tap_check
 	my $dir = shift;
 	chdir $dir;
 
-	my @args = ("prove", "--verbose", "t/*.pl");
+	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
 	local %ENV = %ENV;


[parent: b757e01f62e4]