aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2014-04-16 13:35:46 -0400
committerAndrew Dunstan <andrew@dunslane.net>2014-04-16 13:49:27 -0400
commit179c45ae2fb9519a343bc2e38ebe4609097d14af (patch)
tree507ba83f5554c1cd3c7bdf4a7029b44b244d99e8
parent9ad94ba08491f3300d54f0df954363ae5fe439d4 (diff)
downloadpostgresql-179c45ae2fb9519a343bc2e38ebe4609097d14af.tar.gz
postgresql-179c45ae2fb9519a343bc2e38ebe4609097d14af.zip
Attempt to get plpython regression tests working again for MSVC builds.
This has probably been broken for quite a long time. Buildfarm member currawong's current results suggest that it's been broken since 9.1, so backpatch this to that branch. This only supports Python 2 - I will handle Python 3 separately, but this is a fairly simple fix.
-rw-r--r--src/tools/msvc/vcregress.pl10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 579ca52e02e..cc067ca5448 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -162,7 +162,15 @@ sub plcheck
{
next unless -d "$pl/sql" && -d "$pl/expected";
my $lang = $pl eq 'tcl' ? 'pltcl' : $pl;
- next unless -d "../../$Config/$lang";
+ if ($lang eq 'plpython')
+ {
+ next unless -d "../../$Config/plpython2";
+ $lang = 'plpythonu';
+ }
+ else
+ {
+ next unless -d "../../$Config/$lang";
+ }
$lang = 'plpythonu' if $lang eq 'plpython';
my @lang_args = ("--load-extension=$lang");
chdir $pl;