diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2014-04-16 13:35:46 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2014-04-16 13:35:46 -0400 |
| commit | ef158312e96960bfbc802ceda58f432f6fd845eb (patch) | |
| tree | 12444a1d7e2dc3bc16b20758ff1ba0458c3604e1 | |
| parent | 95cb917297ebe77add3cef4f01cca1004031fa9a (diff) | |
| download | postgresql-ef158312e96960bfbc802ceda58f432f6fd845eb.tar.gz postgresql-ef158312e96960bfbc802ceda58f432f6fd845eb.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.pl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 447b4a19167..1b0c9d4c0f7 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -170,8 +170,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(); |