perltidy some recent code changes before changing perltidy settings
This commit is contained in:
parent
d1e2cac5ff
commit
286bb240e1
|
@ -253,7 +253,7 @@ sub ParseData
|
||||||
# We're treating the input line as a piece of Perl, so we
|
# We're treating the input line as a piece of Perl, so we
|
||||||
# need to use string eval here. Tell perlcritic we know what
|
# need to use string eval here. Tell perlcritic we know what
|
||||||
# we're doing.
|
# we're doing.
|
||||||
eval '$hash_ref = ' . $_; ## no critic (ProhibitStringyEval)
|
eval '$hash_ref = ' . $_; ## no critic (ProhibitStringyEval)
|
||||||
if (!ref $hash_ref)
|
if (!ref $hash_ref)
|
||||||
{
|
{
|
||||||
die "$input_file: error parsing line $.:\n$_\n";
|
die "$input_file: error parsing line $.:\n$_\n";
|
||||||
|
|
|
@ -462,11 +462,11 @@ sub CopyContribFiles
|
||||||
while (my $d = readdir($D))
|
while (my $d = readdir($D))
|
||||||
{
|
{
|
||||||
# These configuration-based exclusions must match vcregress.pl
|
# These configuration-based exclusions must match vcregress.pl
|
||||||
next if ($d eq "uuid-ossp" && !defined($config->{uuid}));
|
next if ($d eq "uuid-ossp" && !defined($config->{uuid}));
|
||||||
next if ($d eq "sslinfo" && !defined($config->{openssl}));
|
next if ($d eq "sslinfo" && !defined($config->{openssl}));
|
||||||
next if ($d eq "xml2" && !defined($config->{xml}));
|
next if ($d eq "xml2" && !defined($config->{xml}));
|
||||||
next if ($d =~ /_plperl$/ && !defined($config->{perl}));
|
next if ($d =~ /_plperl$/ && !defined($config->{perl}));
|
||||||
next if ($d =~ /_plpython$/ && !defined($config->{python}));
|
next if ($d =~ /_plpython$/ && !defined($config->{python}));
|
||||||
next if ($d eq "sepgsql");
|
next if ($d eq "sepgsql");
|
||||||
|
|
||||||
CopySubdirFiles($subdir, $d, $config, $target);
|
CopySubdirFiles($subdir, $d, $config, $target);
|
||||||
|
|
|
@ -257,14 +257,16 @@ sub mangle_plpython3
|
||||||
foreach my $test (@$tests)
|
foreach my $test (@$tests)
|
||||||
{
|
{
|
||||||
local $/ = undef;
|
local $/ = undef;
|
||||||
foreach my $dir ('sql','expected')
|
foreach my $dir ('sql', 'expected')
|
||||||
{
|
{
|
||||||
my $extension = ($dir eq 'sql' ? 'sql' : 'out');
|
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)
|
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>;
|
my $contents = <$handle>;
|
||||||
close($handle);
|
close($handle);
|
||||||
do
|
do
|
||||||
|
@ -279,16 +281,18 @@ sub mangle_plpython3
|
||||||
s/LANGUAGE plpython2?u/LANGUAGE plpython3u/g;
|
s/LANGUAGE plpython2?u/LANGUAGE plpython3u/g;
|
||||||
s/EXTENSION ([^ ]*_)*plpython2?u/EXTENSION $1plpython3u/g;
|
s/EXTENSION ([^ ]*_)*plpython2?u/EXTENSION $1plpython3u/g;
|
||||||
s/installing required extension "plpython2u"/installing required extension "plpython3u"/g;
|
s/installing required extension "plpython2u"/installing required extension "plpython3u"/g;
|
||||||
} for ($contents);
|
}
|
||||||
|
for ($contents);
|
||||||
my $base = basename $file;
|
my $base = basename $file;
|
||||||
open($handle, '>', "$dir/python3/$base") ||
|
open($handle, '>', "$dir/python3/$base")
|
||||||
die "opening python 3 file for $file";
|
|| die "opening python 3 file for $file";
|
||||||
print $handle $contents;
|
print $handle $contents;
|
||||||
close($handle);
|
close($handle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
do { s!^!python3/!; } foreach(@$tests);
|
do { s!^!python3/!; }
|
||||||
|
foreach (@$tests);
|
||||||
return @$tests;
|
return @$tests;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -314,8 +318,9 @@ sub plcheck
|
||||||
}
|
}
|
||||||
if ($lang eq 'plpython')
|
if ($lang eq 'plpython')
|
||||||
{
|
{
|
||||||
next unless -d "$topdir/$Config/plpython2" ||
|
next
|
||||||
-d "$topdir/$Config/plpython3";
|
unless -d "$topdir/$Config/plpython2"
|
||||||
|
|| -d "$topdir/$Config/plpython3";
|
||||||
$lang = 'plpythonu';
|
$lang = 'plpythonu';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -326,7 +331,7 @@ sub plcheck
|
||||||
chdir $dir;
|
chdir $dir;
|
||||||
my @tests = fetchTests();
|
my @tests = fetchTests();
|
||||||
@tests = mangle_plpython3(\@tests)
|
@tests = mangle_plpython3(\@tests)
|
||||||
if $lang eq 'plpythonu' && -d "$topdir/$Config/plpython3";
|
if $lang eq 'plpythonu' && -d "$topdir/$Config/plpython3";
|
||||||
if ($lang eq 'plperl')
|
if ($lang eq 'plperl')
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -380,7 +385,7 @@ sub subdircheck
|
||||||
# Special processing for python transform modules, see their respective
|
# Special processing for python transform modules, see their respective
|
||||||
# Makefiles for more details regarding Python-version specific
|
# Makefiles for more details regarding Python-version specific
|
||||||
# dependencies.
|
# dependencies.
|
||||||
if ( $module =~ /_plpython$/ )
|
if ($module =~ /_plpython$/)
|
||||||
{
|
{
|
||||||
die "Python not enabled in configuration"
|
die "Python not enabled in configuration"
|
||||||
if !defined($config->{python});
|
if !defined($config->{python});
|
||||||
|
@ -405,7 +410,7 @@ sub subdircheck
|
||||||
"$topdir/$Config/pg_regress/pg_regress",
|
"$topdir/$Config/pg_regress/pg_regress",
|
||||||
"--bindir=${topdir}/${Config}/psql",
|
"--bindir=${topdir}/${Config}/psql",
|
||||||
"--dbname=contrib_regression", @opts, @tests);
|
"--dbname=contrib_regression", @opts, @tests);
|
||||||
print join(' ',@args),"\n";
|
print join(' ', @args), "\n";
|
||||||
system(@args);
|
system(@args);
|
||||||
chdir "..";
|
chdir "..";
|
||||||
}
|
}
|
||||||
|
@ -417,11 +422,11 @@ sub contribcheck
|
||||||
foreach my $module (glob("*"))
|
foreach my $module (glob("*"))
|
||||||
{
|
{
|
||||||
# these configuration-based exclusions must match Install.pm
|
# these configuration-based exclusions must match Install.pm
|
||||||
next if ($module eq "uuid-ossp" && !defined($config->{uuid}));
|
next if ($module eq "uuid-ossp" && !defined($config->{uuid}));
|
||||||
next if ($module eq "sslinfo" && !defined($config->{openssl}));
|
next if ($module eq "sslinfo" && !defined($config->{openssl}));
|
||||||
next if ($module eq "xml2" && !defined($config->{xml}));
|
next if ($module eq "xml2" && !defined($config->{xml}));
|
||||||
next if ($module =~ /_plperl$/ && !defined($config->{perl}));
|
next if ($module =~ /_plperl$/ && !defined($config->{perl}));
|
||||||
next if ($module =~ /_plpython$/ && !defined($config->{python}));
|
next if ($module =~ /_plpython$/ && !defined($config->{python}));
|
||||||
next if ($module eq "sepgsql");
|
next if ($module eq "sepgsql");
|
||||||
|
|
||||||
subdircheck($module);
|
subdircheck($module);
|
||||||
|
|
Loading…
Reference in New Issue