aboutsummaryrefslogtreecommitdiff
path: root/src
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:44:34 -0400
commitd3c7498042658884d388c1e86f060d2bf563eedd (patch)
tree4add6943a859aee46bc9242b47bfa370fa90f8ce /src
parentbac05d622dd9a1186cb81ac09b04736b815b6226 (diff)
downloadpostgresql-d3c7498042658884d388c1e86f060d2bf563eedd.tar.gz
postgresql-d3c7498042658884d388c1e86f060d2bf563eedd.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.
Diffstat (limited to 'src')
-rw-r--r--src/tools/msvc/vcregress.pl11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index cdba9a5fb71..08e94ffa576 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -168,8 +168,15 @@ sub plcheck
{
next unless -d "$pl/sql" && -d "$pl/expected";
my $lang = $pl eq 'tcl' ? 'pltcl' : $pl;
- next unless -d "../../$Config/$lang";
- $lang = 'plpythonu' if $lang eq 'plpython';
+ if ($lang eq 'plpython')
+ {
+ next unless -d "../../$Config/plpython2";
+ $lang = 'plpythonu';
+ }
+ else
+ {
+ next unless -d "../../$Config/$lang";
+ }
my @lang_args = ("--load-extension=$lang");
chdir $pl;
my @tests = fetchTests();