diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2017-06-10 10:19:06 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2017-06-10 10:19:06 -0400 |
| commit | 93b7d9731f184e764c642266ecd74be24db73a6e (patch) | |
| tree | b9a747ce1766af79d307cb42700fed40344da373 | |
| parent | e20f679f66fb7930215a1b59f13b5b1c06bfc456 (diff) | |
| download | postgresql-93b7d9731f184e764c642266ecd74be24db73a6e.tar.gz postgresql-93b7d9731f184e764c642266ecd74be24db73a6e.zip | |
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.
| -rw-r--r-- | src/Makefile.global.in | 2 | ||||
| -rw-r--r-- | 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 8bebc0244ac..7af91e2d586 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -340,7 +340,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 468a62d8aaa..eeba30ec8b9 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -178,12 +178,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 |