|
|
|
@ -257,14 +257,16 @@ sub mangle_plpython3 |
|
|
|
|
foreach my $test (@$tests) |
|
|
|
|
{ |
|
|
|
|
local $/ = undef; |
|
|
|
|
foreach my $dir ('sql','expected') |
|
|
|
|
foreach my $dir ('sql', 'expected') |
|
|
|
|
{ |
|
|
|
|
my $extension = ($dir eq 'sql' ? 'sql' : 'out'); |
|
|
|
|
|
|
|
|
|
my @files = glob("$dir/$test.$extension $dir/${test}_[0-9].$extension"); |
|
|
|
|
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"; |
|
|
|
|
open(my $handle, '<', $file) |
|
|
|
|
|| die "test file $file not found"; |
|
|
|
|
my $contents = <$handle>; |
|
|
|
|
close($handle); |
|
|
|
|
do |
|
|
|
@ -279,16 +281,18 @@ sub mangle_plpython3 |
|
|
|
|
s/LANGUAGE plpython2?u/LANGUAGE plpython3u/g; |
|
|
|
|
s/EXTENSION ([^ ]*_)*plpython2?u/EXTENSION $1plpython3u/g; |
|
|
|
|
s/installing required extension "plpython2u"/installing required extension "plpython3u"/g; |
|
|
|
|
} for ($contents); |
|
|
|
|
} |
|
|
|
|
for ($contents); |
|
|
|
|
my $base = basename $file; |
|
|
|
|
open($handle, '>', "$dir/python3/$base") || |
|
|
|
|
die "opening python 3 file for $file"; |
|
|
|
|
open($handle, '>', "$dir/python3/$base") |
|
|
|
|
|| die "opening python 3 file for $file"; |
|
|
|
|
print $handle $contents; |
|
|
|
|
close($handle); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
do { s!^!python3/!; } foreach(@$tests); |
|
|
|
|
do { s!^!python3/!; } |
|
|
|
|
foreach (@$tests); |
|
|
|
|
return @$tests; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -314,8 +318,9 @@ sub plcheck |
|
|
|
|
} |
|
|
|
|
if ($lang eq 'plpython') |
|
|
|
|
{ |
|
|
|
|
next unless -d "$topdir/$Config/plpython2" || |
|
|
|
|
-d "$topdir/$Config/plpython3"; |
|
|
|
|
next |
|
|
|
|
unless -d "$topdir/$Config/plpython2" |
|
|
|
|
|| -d "$topdir/$Config/plpython3"; |
|
|
|
|
$lang = 'plpythonu'; |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
@ -326,7 +331,7 @@ sub plcheck |
|
|
|
|
chdir $dir; |
|
|
|
|
my @tests = fetchTests(); |
|
|
|
|
@tests = mangle_plpython3(\@tests) |
|
|
|
|
if $lang eq 'plpythonu' && -d "$topdir/$Config/plpython3"; |
|
|
|
|
if $lang eq 'plpythonu' && -d "$topdir/$Config/plpython3"; |
|
|
|
|
if ($lang eq 'plperl') |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
@ -380,7 +385,7 @@ sub subdircheck |
|
|
|
|
# Special processing for python transform modules, see their respective |
|
|
|
|
# Makefiles for more details regarding Python-version specific |
|
|
|
|
# dependencies. |
|
|
|
|
if ( $module =~ /_plpython$/ ) |
|
|
|
|
if ($module =~ /_plpython$/) |
|
|
|
|
{ |
|
|
|
|
die "Python not enabled in configuration" |
|
|
|
|
if !defined($config->{python}); |
|
|
|
@ -405,7 +410,7 @@ sub subdircheck |
|
|
|
|
"$topdir/$Config/pg_regress/pg_regress", |
|
|
|
|
"--bindir=${topdir}/${Config}/psql", |
|
|
|
|
"--dbname=contrib_regression", @opts, @tests); |
|
|
|
|
print join(' ',@args),"\n"; |
|
|
|
|
print join(' ', @args), "\n"; |
|
|
|
|
system(@args); |
|
|
|
|
chdir ".."; |
|
|
|
|
} |
|
|
|
@ -417,11 +422,11 @@ sub contribcheck |
|
|
|
|
foreach my $module (glob("*")) |
|
|
|
|
{ |
|
|
|
|
# these configuration-based exclusions must match Install.pm |
|
|
|
|
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 =~ /_plperl$/ && !defined($config->{perl})); |
|
|
|
|
next if ($module =~ /_plpython$/ && !defined($config->{python})); |
|
|
|
|
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 =~ /_plperl$/ && !defined($config->{perl})); |
|
|
|
|
next if ($module =~ /_plpython$/ && !defined($config->{python})); |
|
|
|
|
next if ($module eq "sepgsql"); |
|
|
|
|
|
|
|
|
|
subdircheck($module); |
|
|
|
|