From c4dcdd0c259bef380146eadbb55a48d4f3257639 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Wed, 16 Apr 2014 13:35:46 -0400 Subject: [PATCH] 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. --- src/tools/msvc/vcregress.pl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 89bd31a306..40df2c99b0 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -169,8 +169,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(); -- 2.40.0