]> 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:43:32 +0000 (13:43 -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 89bd31a306c71a7d48e5bbc8f27302d7419c425d..40df2c99b03bb155756894b05d0775b0e747de52 100644 (file)
@@ -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();