From: Andrew Dunstan <andrew@dunslane.net>
Date: Sun, 16 Jul 2017 15:24:29 +0000 (-0400)
Subject: Fix vcregress.pl PROVE_FLAGS bug in commit 93b7d9731f
X-Git-Tag: REL9_4_13~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c3f502b45a9f6c7bf7505ac84f13712fff1ee71;p=postgresql

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.
---

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 8265aef2b7..1cad69c791 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -223,11 +223,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;
 }