summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2017-07-16 11:24:29 -0400
committerAndrew Dunstan <andrew@dunslane.net>2017-07-16 11:27:07 -0400
commit7eb4124da5ba5d905d911a8f786f78df7703c089 (patch)
tree633f22a4bc5b24be7562ceb9f556742126cff9d8
parentf20d58a6f7b68b731c94a639e4c0802e8a0acb5b (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 0006c4780d2..6fd0b7e8af8 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -225,11 +225,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;
}