From 2c059c86ba774930fa816278343ff30292db4e6c Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 3 Jul 2018 18:23:50 +0200
Subject: [PATCH] Add $Test::Builder::Level to pgbench test functions

same as c4309f4aeeae54e4c5281d68e29288af1d0d1ed2
---
 src/bin/pgbench/t/001_pgbench_with_server.pl | 4 ++++
 src/bin/pgbench/t/002_pgbench_no_server.pl   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
index 6b3bcef25a..2fc021dde7 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 aa47710ace..a2845a583b 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 = ();
-- 
2.40.0