aboutsummaryrefslogtreecommitdiff
path: root/src/test/perl/TestLib.pm
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2018-05-27 09:08:42 -0400
committerAndrew Dunstan <andrew@dunslane.net>2018-05-27 09:08:42 -0400
commit3a7cc727c7c502353dbb730a0db793abec4de44b (patch)
treec140b2974559d0a13d98c132ae52f7d0992aff95 /src/test/perl/TestLib.pm
parent8a56ff484808e9c05df9656cf4244229e8c7960d (diff)
downloadpostgresql-3a7cc727c7c502353dbb730a0db793abec4de44b.tar.gz
postgresql-3a7cc727c7c502353dbb730a0db793abec4de44b.zip
Don't fall off the end of perl functions
This complies with the perlcritic policy Subroutines::RequireFinalReturn, which is a severity 4 policy. Since we only currently check at severity level 5, the policy is raised to that level until we move to level 4 or lower, so that any new infringements will be caught. A small cosmetic piece of tidying of the pgperlcritic script is included. Mike Blackwell Discussion: https://postgr.es/m/CAESHdJpfFm_9wQnQ3koY3c91FoRQsO-fh02za9R3OEMndOn84A@mail.gmail.com
Diffstat (limited to 'src/test/perl/TestLib.pm')
-rw-r--r--src/test/perl/TestLib.pm14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index c9f824b4c65..77499c01e96 100644
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -194,6 +194,7 @@ sub system_or_bail
{
BAIL_OUT("system $_[0] failed");
}
+ return;
}
sub run_log
@@ -244,6 +245,7 @@ sub append_to_file
or die "could not write \"$filename\": $!";
print $fh $str;
close $fh;
+ return;
}
# Check that all file/dir modes in a directory match the expected values,
@@ -338,6 +340,7 @@ sub chmod_recursive
}
},
$dir);
+ return;
}
# Check presence of a given regexp within pg_config.h for the installation
@@ -366,6 +369,7 @@ sub command_ok
my ($cmd, $test_name) = @_;
my $result = run_log($cmd);
ok($result, $test_name);
+ return;
}
sub command_fails
@@ -373,6 +377,7 @@ sub command_fails
my ($cmd, $test_name) = @_;
my $result = run_log($cmd);
ok(!$result, $test_name);
+ return;
}
sub command_exit_is
@@ -394,6 +399,7 @@ sub command_exit_is
? ($h->full_results)[0]
: $h->result(0);
is($result, $expected, $test_name);
+ return;
}
sub program_help_ok
@@ -406,6 +412,7 @@ sub program_help_ok
ok($result, "$cmd --help exit code 0");
isnt($stdout, '', "$cmd --help goes to stdout");
is($stderr, '', "$cmd --help nothing to stderr");
+ return;
}
sub program_version_ok
@@ -418,6 +425,7 @@ sub program_version_ok
ok($result, "$cmd --version exit code 0");
isnt($stdout, '', "$cmd --version goes to stdout");
is($stderr, '', "$cmd --version nothing to stderr");
+ return;
}
sub program_options_handling_ok
@@ -430,6 +438,7 @@ sub program_options_handling_ok
'2>', \$stderr;
ok(!$result, "$cmd with invalid option nonzero exit code");
isnt($stderr, '', "$cmd with invalid option prints error message");
+ return;
}
sub command_like
@@ -441,6 +450,7 @@ sub command_like
ok($result, "$test_name: exit code 0");
is($stderr, '', "$test_name: no stderr");
like($stdout, $expected_stdout, "$test_name: matches");
+ return;
}
sub command_like_safe
@@ -460,6 +470,7 @@ sub command_like_safe
ok($result, "$test_name: exit code 0");
is($stderr, '', "$test_name: no stderr");
like($stdout, $expected_stdout, "$test_name: matches");
+ return;
}
sub command_fails_like
@@ -470,6 +481,7 @@ sub command_fails_like
my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
ok(!$result, "$test_name: exit code not 0");
like($stderr, $expected_stderr, "$test_name: matches");
+ return;
}
# Run a command and check its status and outputs.
@@ -509,6 +521,8 @@ sub command_checks_all
{
like($stderr, $re, "$test_name stderr /$re/");
}
+
+ return;
}
1;