]> granicus.if.org Git - postgresql/commitdiff
Fix vcregress.pl PROVE_FLAGS bug in commit 93b7d9731f
authorAndrew Dunstan <andrew@dunslane.net>
Sun, 16 Jul 2017 15:24:29 +0000 (11:24 -0400)
committerAndrew Dunstan <andrew@dunslane.net>
Sun, 16 Jul 2017 15:27:00 +0000 (11:27 -0400)
This change didn't adjust the publicly visible taptest function, causing
buildfarm failures on bowerbird.

Backpatch to 9.4 like previous change.

src/tools/msvc/vcregress.pl

index 3acb9c0ee872e895847c3df0716299edf568dbc7..0d0cff9185ab26ef2035801e3633b82d34228ce6 100644 (file)
@@ -226,11 +226,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;
 }