]> granicus.if.org Git - postgresql/commitdiff
Add $Test::Builder::Level to pgbench test functions
authorPeter Eisentraut <peter_e@gmx.net>
Tue, 3 Jul 2018 16:23:50 +0000 (18:23 +0200)
committerPeter Eisentraut <peter_e@gmx.net>
Tue, 3 Jul 2018 21:22:01 +0000 (23:22 +0200)
same as c4309f4aeeae54e4c5281d68e29288af1d0d1ed2

src/bin/pgbench/t/001_pgbench_with_server.pl
src/bin/pgbench/t/002_pgbench_no_server.pl

index 6b3bcef25a131de8cf414d33590859f4b05e683b..2fc021dde796cd3c2fd845c144ad88f29ec03abc 100644 (file)
@@ -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.*";
index aa47710ace5a3cf9801fec2da4923c2e1c35319e..a2845a583bddd2261ef765b921c637b5f6e21d3c 100644 (file)
@@ -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 = ();