postgres.git / summary / log / commit / refs

commit    ef158312e96960bfbc802ceda58f432f6fd845eb
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Wed Apr 16 17:35:46 2014 +0000
First released in: 9.4.0, 9.1.14, 9.2.9, 9.3.5

    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 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();


[parent: 95cb917297eb]