git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl

index 99286f6bc0c3e8200a8f7acf75754d54c3a9d779..e585220dc088fd7ee948415149042928245b4503 100644 (file)

--- a/src/bin/pgbench/t/001_pgbench_with_server.pl

+++ b/src/bin/pgbench/t/001_pgbench_with_server.pl

{

my ($prefix, $nb, $min, $max, $re) = @_;

- my @logs = <$prefix.*>;

+ my @logs = glob "$prefix.*";

ok(@logs == $nb, "number of log files");

ok(grep(/^$prefix\.\d+(\.\d+)?$/, @logs) == $nb, "file name format");

for my $log (sort @logs)

{

eval {

- open LOG, $log or die "$@";

- my @contents = <LOG>;

+ open my $fh, '<', $log or die "$@";

+ my @contents = <$fh>;

my $clen = @contents;

ok( $min <= $clen && $clen <= $max,

"transaction count for $log ($clen)");

ok( grep($re, @contents) == $clen,

"transaction format for $prefix");

- close LOG or die "$@";

+ close $fh or die "$@";

};

}

ok(unlink(@logs), "remove log files");