summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan2017-07-16 15:24:29 +0000
committerAndrew Dunstan2017-07-16 15:24:29 +0000
commitfd2487e49f406471c11fc337b3e06dcb8579c809 (patch)
tree41784f4ff058b0c1d46c89bf623187c872e70d3e
parentde2af6e001a3d6aeb2a10a802e73af8c7d1d3405 (diff)
Fix vcregress.pl PROVE_FLAGS bug in commit 93b7d9731f
This change didn't adjust the publicly visible taptest function, causing buildfarm failures on bowerbird. Backpatch to 9.4 like previous change.
-rw-r--r--src/tools/msvc/vcregress.pl11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index eeba30ec8b..2ee9e48d3a 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -227,11 +227,20 @@ sub bincheck
sub taptest
{
my $dir = shift;
+ my @args;
+
+ if ($dir =~ /^PROVE_FLAGS=/)
+ {
+ push(@args, $dir);
+ $dir = shift;
+ }
die "no tests found!" unless -d "$topdir/$dir/t";
+ push(@args,"$topdir/$dir);
+
InstallTemp();
- my $status = tap_check("$topdir/$dir");
+ my $status = tap_check(@args);
exit $status if $status;
}