aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2018-07-03 18:23:50 +0200
committerPeter Eisentraut <peter_e@gmx.net>2018-07-03 23:22:01 +0200
commit2c059c86ba774930fa816278343ff30292db4e6c (patch)
tree55e15bbc17aa5c4894dc4e539b2a7d490c49942f
parent683707868723d2a798ff8dcb0513d89735591b66 (diff)
downloadpostgresql-2c059c86ba774930fa816278343ff30292db4e6c.tar.gz
postgresql-2c059c86ba774930fa816278343ff30292db4e6c.zip
Add $Test::Builder::Level to pgbench test functions
same as c4309f4aeeae54e4c5281d68e29288af1d0d1ed2
-rw-r--r--src/bin/pgbench/t/001_pgbench_with_server.pl4
-rw-r--r--src/bin/pgbench/t/002_pgbench_no_server.pl4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
index 6b3bcef25a1..2fc021dde79 100644
--- a/src/bin/pgbench/t/001_pgbench_with_server.pl
+++ b/src/bin/pgbench/t/001_pgbench_with_server.pl
@@ -13,6 +13,8 @@ $node->start;
# invoke pgbench
sub pgbench
{
+ local $Test::Builder::Level = $Test::Builder::Level + 1;
+
my ($opts, $stat, $out, $err, $name, $files) = @_;
my @cmd = ('pgbench', split /\s+/, $opts);
my @filenames = ();
@@ -798,6 +800,8 @@ pgbench(
# check log contents and cleanup
sub check_pgbench_logs
{
+ local $Test::Builder::Level = $Test::Builder::Level + 1;
+
my ($prefix, $nb, $min, $max, $re) = @_;
my @logs = glob "$prefix.*";
diff --git a/src/bin/pgbench/t/002_pgbench_no_server.pl b/src/bin/pgbench/t/002_pgbench_no_server.pl
index aa47710ace5..a2845a583bd 100644
--- a/src/bin/pgbench/t/002_pgbench_no_server.pl
+++ b/src/bin/pgbench/t/002_pgbench_no_server.pl
@@ -20,6 +20,8 @@ mkdir $testdir
# invoke pgbench
sub pgbench
{
+ local $Test::Builder::Level = $Test::Builder::Level + 1;
+
my ($opts, $stat, $out, $err, $name) = @_;
print STDERR "opts=$opts, stat=$stat, out=$out, err=$err, name=$name";
command_checks_all([ 'pgbench', split(/\s+/, $opts) ],
@@ -30,6 +32,8 @@ sub pgbench
# invoke pgbench with scripts
sub pgbench_scripts
{
+ local $Test::Builder::Level = $Test::Builder::Level + 1;
+
my ($opts, $stat, $out, $err, $name, $files) = @_;
my @cmd = ('pgbench', split /\s+/, $opts);
my @filenames = ();