Provide for testing on python3 modules when under MSVC

This should have been done some years ago as promised in commit
c4dcdd0c2. However, better late than never.

Along the way do a little housekeeping, including using a simpler test
for the python version being tested, and removing a redundant subroutine
parameter. These changes only apply back to release 9.5.

Backpatch to all live releases.

diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 46c753acad80fc20d5ffdc3733f3401e3b899842..6e881dd11db47a205171fd9867fa266fafd22ea3 100644 (file)
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -458,14 +458,12 @@ sub CopyContribFiles
        opendir($D, $subdir) || croak "Could not opendir on $subdir!\n";
        while (my $d = readdir($D))
        {
-
            # These configuration-based exclusions must match vcregress.pl
            next if ($d eq "uuid-ossp"       && !defined($config->{uuid}));
            next if ($d eq "sslinfo"         && !defined($config->{openssl}));
            next if ($d eq "xml2"            && !defined($config->{xml}));
-           next if ($d eq "hstore_plperl"   && !defined($config->{perl}));
-           next if ($d eq "hstore_plpython" && !defined($config->{python}));
-           next if ($d eq "ltree_plpython"  && !defined($config->{python}));
+           next if ($d =~ /_plperl$/        && !defined($config->{perl}));
+           next if ($d =~ /_plpython$/      && !defined($config->{python}));
            next if ($d eq "sepgsql");
 
            CopySubdirFiles($subdir, $d, $config, $target);

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index a609d997c92340ae31f822c0620d740f3e011f89..b41011f4d11c803ce2a3e1f4ff7f11ec21c49dad 100644 (file)
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -242,6 +242,51 @@ sub taptest
    exit $status if $status;
 }
 
+sub mangle_plpython3
+{
+   my $tests = shift;
+   mkdir "results" unless -d "results";
+   mkdir "sql/python3";
+   mkdir "results/python3";
+   mkdir "expected/python3";
+
+   foreach my $test (@$tests)
+   {
+       local $/ = undef;
+       foreach my $dir ('sql','expected')
+       {
+           my $extension = ($dir eq 'sql' ? 'sql' : 'out');
+
+           my @files = glob("$dir/$test.$extension $dir/${test}_[0-9].$extension");
+           foreach my $file (@files)
+           {
+               open(my $handle, "$file") || die "test file $file not found";
+               my $contents = <$handle>;
+               close($handle);
+               map
+               {
+                   s/except ([[:alpha:]][[:alpha:].]*), *([[:alpha:]][[:alpha:]]*):/except $1 as $2:/g;
+                   s/<type 'exceptions\.([[:alpha:]]*)'>/<class '$1'>/g;
+                   s/<type 'long'>/<class 'int'>/g;
+                   s/([0-9][0-9]*)L/$1/g;
+                   s/([ [{])u"/$1"/g;
+                   s/([ [{])u'/$1'/g;
+                   s/def next/def __next__/g;
+                   s/LANGUAGE plpython2?u/LANGUAGE plpython3u/g;
+                   s/EXTENSION ([^ ]*_)*plpython2?u/EXTENSION $1plpython3u/g;
+                   s/installing required extension "plpython2u"/installing required extension "plpython3u"/g;
+               } $contents;
+               my $base = basename $file;
+               open($handle, ">$dir/python3/$base") || die "opening python 3 file for $file";
+               print $handle $contents;
+               close($handle);
+           }
+       }
+   }
+   map { $_ =~ s!^!python3/!; } @$tests;
+   return @$tests;
+}
+
 sub plcheck
 {
    chdir "../../pl";
@@ -252,7 +297,8 @@ sub plcheck
        my $lang = $pl eq 'tcl' ? 'pltcl' : $pl;
        if ($lang eq 'plpython')
        {
-           next unless -d "../../$Config/plpython2";
+           next unless -d "$topdir/$Config/plpython2" ||
+               -d "$topdir/$Config/plpython3";
            $lang = 'plpythonu';
        }
        else
@@ -262,6 +308,8 @@ sub plcheck
        my @lang_args = ("--load-extension=$lang");
        chdir $pl;
        my @tests = fetchTests();
+       @tests = mangle_plpython3(\@tests)
+           if $lang eq 'plpythonu' && -d "$topdir/$Config/plpython3";
        if ($lang eq 'plperl')
        {
 
@@ -277,6 +325,10 @@ sub plcheck
                push(@tests, 'plperl_plperlu');
            }
        }
+       elsif ($lang eq 'plpythonu' && -d "$topdir/$Config/plpython3")
+       {
+           @lang_args = ();
+       }
        print
          "============================================================\n";
        print "Checking $lang\n";
@@ -295,7 +347,6 @@ sub plcheck
 
 sub subdircheck
 {
-   my $subdir = shift;
    my $module = shift;
 
    if (   !-d "$module/sql"
@@ -309,43 +360,35 @@ sub subdircheck
    my @tests = fetchTests();
    my @opts  = fetchRegressOpts();
 
-   # Add some options for transform modules, see their respective
-   # Makefile for more details regarding Python-version specific
+   # Special processing for python transform modules, see their respective
+   # Makefiles for more details regarding Python-version specific
    # dependencies.
-   if (   $module eq "hstore_plpython"
-       || $module eq "ltree_plpython")
+   if ( $module =~ /_plpython$/ )
    {
        die "Python not enabled in configuration"
          if !defined($config->{python});
 
-       # Attempt to get python version and location.
-       # Assume python.exe in specified dir.
-       my $pythonprog = "import sys;" . "print(str(sys.version_info[0]))";
-       my $prefixcmd  = $config->{python} . "\\python -c \"$pythonprog\"";
-       my $pyver      = `$prefixcmd`;
-       die "Could not query for python version!\n" if $?;
-       chomp($pyver);
-       if ($pyver eq "2")
+       @opts = grep { $_ !~ /plpythonu/ } @opts;
+
+       if (-d "$topdir/$Config/plpython2")
        {
            push @opts, "--load-extension=plpythonu";
            push @opts, '--load-extension=' . $module . 'u';
        }
        else
        {
-
-           # disable tests on python3 for now.
-           chdir "..";
-           return;
+           # must be python 3
+           @tests = mangle_plpython3(\@tests);
        }
    }
 
-
    print "============================================================\n";
    print "Checking $module\n";
    my @args = (
        "$topdir/$Config/pg_regress/pg_regress",
        "--bindir=${topdir}/${Config}/psql",
        "--dbname=contrib_regression", @opts, @tests);
+   print join(' ',@args),"\n";
    system(@args);
    chdir "..";
 }
@@ -360,12 +403,11 @@ sub contribcheck
        next if ($module eq "uuid-ossp"     && !defined($config->{uuid}));
        next if ($module eq "sslinfo"       && !defined($config->{openssl}));
        next if ($module eq "xml2"          && !defined($config->{xml}));
-       next if ($module eq "hstore_plperl" && !defined($config->{perl}));
-       next if ($module eq "hstore_plpython" && !defined($config->{python}));
-       next if ($module eq "ltree_plpython"  && !defined($config->{python}));
+       next if ($module =~ /_plperl$/      && !defined($config->{perl}));
+       next if ($module =~ /_plpython$/    && !defined($config->{python}));
        next if ($module eq "sepgsql");
 
-       subdircheck("$topdir/contrib", $module);
+       subdircheck($module);
        my $status = $? >> 8;
        $mstat ||= $status;
    }
@@ -378,7 +420,7 @@ sub modulescheck
    my $mstat = 0;
    foreach my $module (glob("*"))
    {
-       subdircheck("$topdir/src/test/modules", $module);
+       subdircheck($module);
        my $status = $? >> 8;
        $mstat ||= $status;
    }