git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bac05d6)
Attempt to get plpython regression tests working again for MSVC builds.
2014年4月16日 17:35:46 +0000 (13:35 -0400)
2014年4月16日 17:44:34 +0000 (13:44 -0400)
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.


diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index cdba9a5fb719c16cc88246d2b2367a05be281e90..08e94ffa576f04878e81b6fab1048dfbbf706eef 100644 (file)
--- 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();
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /