database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

perltidy some recent code changes before changing perltidy settings

Browse Source
This commit is contained in:
Andrew Dunstan
2018-05-09 10:04:17 -04:00
parent d1e2cac5ff
commit 286bb240e1
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/tools/msvc/vcregress.pl
View File

@ -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
@ -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 "..";
} }