]> granicus.if.org Git - postgresql/commitdiff
Attempt to get plpython regression tests working again for MSVC builds.
authorAndrew Dunstan <andrew@dunslane.net>
Wed, 16 Apr 2014 17:35:46 +0000 (13:35 -0400)
committerAndrew Dunstan <andrew@dunslane.net>
Wed, 16 Apr 2014 17:49:27 +0000 (13:49 -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.

src/tools/msvc/vcregress.pl

index 579ca52e02ede2e638554a85d4f08de56033e1e5..cc067ca54486bddb821302bbf0a54447bb717f10 100644 (file)
@@ -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;