postgres.git / summary / log / commit / refs

commit    054a897c40c683b27cefaacbb85d536fcd8eedd1
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Fri May 12 15:21:20 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      | 3 ++-
 src/tools/msvc/vcregress.pl | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 340e7441f45..8afc27bf0d3 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -334,7 +334,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)
-PROVE_FLAGS = --verbose
+# 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 bd1b607b001..60a99f7ceb1 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -179,7 +179,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: 8ec82ee6ae7a]