diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2017-05-12 11:21:20 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2017-05-12 11:26:40 -0400 |
| commit | 054a897c40c683b27cefaacbb85d536fcd8eedd1 (patch) | |
| tree | c9cc39484e4d9c828a32cc06dccac92e67131f0f | |
| parent | 8ec82ee6ae7a302ab696f696a5eb2f45ae3c5910 (diff) | |
| download | postgresql-054a897c40c683b27cefaacbb85d536fcd8eedd1.tar.gz postgresql-054a897c40c683b27cefaacbb85d536fcd8eedd1.zip | |
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
| -rw-r--r-- | src/Makefile.global.in | 3 | ||||
| -rw-r--r-- | 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; |