|
|
|
@ -261,10 +261,12 @@ sub mangle_plpython3 |
|
|
|
|
{ |
|
|
|
|
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 |
|
|
|
|