diff options
| -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 54bdf7e2f2c..b4c38e2f82d 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -321,7 +321,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 b54bcd43532..8265aef2b78 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -174,12 +174,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 |