aboutsummaryrefslogtreecommitdiff
path: root/src/test/perl/TestLib.pm
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2018-04-25 14:00:19 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2018-04-25 14:00:19 -0400
commitf04d4ac919b9ae9b57e977523e4b40979aa8b951 (patch)
treeea104f87f210c15479c92bc5f4dd8c06f7a30583 /src/test/perl/TestLib.pm
parent46cda5bf7bc209554b3c1bbb3040b45735387e0c (diff)
downloadpostgresql-f04d4ac919b9ae9b57e977523e4b40979aa8b951.tar.gz
postgresql-f04d4ac919b9ae9b57e977523e4b40979aa8b951.zip
Reindent Perl files with perltidy version 20170521.
Discussion: https://postgr.es/m/CABUevEzK3cNiHZQ18f5tK0guoT+cN_jWeVzhYYxY=r+1Q3SmoA@mail.gmail.com
Diffstat (limited to 'src/test/perl/TestLib.pm')
-rw-r--r--src/test/perl/TestLib.pm72
1 files changed, 36 insertions, 36 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 8047404efd4..355ef5fc829 100644
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -169,16 +169,17 @@ sub tempdir_short
# not under msys, return the input argument unchanged.
sub real_dir
{
- my $dir = "$_[0]";
- return $dir unless -d $dir;
- return $dir unless $Config{osname} eq 'msys';
- my $here = cwd;
- chdir $dir;
+ my $dir = "$_[0]";
+ return $dir unless -d $dir;
+ return $dir unless $Config{osname} eq 'msys';
+ my $here = cwd;
+ chdir $dir;
+
# this odd way of calling 'pwd -W' is the only way that seems to work.
- $dir = qx{sh -c "pwd -W"};
- chomp $dir;
- chdir $here;
- return $dir;
+ $dir = qx{sh -c "pwd -W"};
+ chomp $dir;
+ chdir $here;
+ return $dir;
}
sub system_log
@@ -254,12 +255,9 @@ sub check_mode_recursive
# Result defaults to true
my $result = 1;
- find
- (
- {follow_fast => 1,
- wanted =>
- sub
- {
+ find(
+ { follow_fast => 1,
+ wanted => sub {
my $file_stat = stat($File::Find::name);
# Is file in the ignore list?
@@ -272,7 +270,7 @@ sub check_mode_recursive
}
defined($file_stat)
- or die("unable to stat $File::Find::name");
+ or die("unable to stat $File::Find::name");
my $file_mode = S_IMODE($file_stat->mode);
@@ -281,35 +279,39 @@ sub check_mode_recursive
{
if ($file_mode != $expected_file_mode)
{
- print(*STDERR,
+ print(
+ *STDERR,
sprintf("$File::Find::name mode must be %04o\n",
- $expected_file_mode));
+ $expected_file_mode));
$result = 0;
return;
}
}
+
# Else a directory?
elsif (S_ISDIR($file_stat->mode))
{
if ($file_mode != $expected_dir_mode)
{
- print(*STDERR,
+ print(
+ *STDERR,
sprintf("$File::Find::name mode must be %04o\n",
- $expected_dir_mode));
+ $expected_dir_mode));
$result = 0;
return;
}
}
+
# Else something we can't handle
else
{
die "unknown file type for $File::Find::name";
}
- }},
- $dir
- );
+ }
+ },
+ $dir);
return $result;
}
@@ -319,23 +321,21 @@ sub chmod_recursive
{
my ($dir, $dir_mode, $file_mode) = @_;
- find
- (
- {follow_fast => 1,
- wanted =>
- sub
- {
+ find(
+ { follow_fast => 1,
+ wanted => sub {
my $file_stat = stat($File::Find::name);
if (defined($file_stat))
{
- chmod(S_ISDIR($file_stat->mode) ? $dir_mode : $file_mode,
- $File::Find::name)
- or die "unable to chmod $File::Find::name";
+ chmod(
+ S_ISDIR($file_stat->mode) ? $dir_mode : $file_mode,
+ $File::Find::name
+ ) or die "unable to chmod $File::Find::name";
}
- }},
- $dir
- );
+ }
+ },
+ $dir);
}
# Check presence of a given regexp within pg_config.h for the installation
@@ -351,7 +351,7 @@ sub check_pg_config
chomp($stdout);
open my $pg_config_h, '<', "$stdout/pg_config.h" or die "$!";
- my $match = (grep {/^$regexp/} <$pg_config_h>);
+ my $match = (grep { /^$regexp/ } <$pg_config_h>);
close $pg_config_h;
return $match;
}