From 737abbc1115ee1360ac950bcf6abe1677f1eaa79 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 13 Jun 2020 15:29:48 -0700 Subject: [PATCH 1/3] Write to stdout instead of --disable-seeking --- src/bin/pg_dump/t/002_pg_dump.pl | 4 ++-- src/test/perl/TestLib.pm | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl index 2423ec5b1d..8c89488a12 100644 --- a/src/bin/pg_dump/t/002_pg_dump.pl +++ b/src/bin/pg_dump/t/002_pg_dump.pl @@ -153,8 +153,8 @@ my %pgdump_runs = ( defaults_custom_format_no_seek_parallel_restore => { test_key => 'defaults', dump_cmd => [ - 'pg_dump', '-Fc', '-Z6', '--no-sync', '--disable-seeking', - "--file=$tempdir/defaults_custom_format_no_seek_parallel_restore.dump", 'postgres', + [ 'pg_dump', '-Fc', '-Z6', '--no-sync', 'postgres', ], + '>', "$tempdir/defaults_custom_format_no_seek_parallel_restore.dump", # stdout disables seeking ], restore_cmd => [ 'pg_restore', '-Fc', '--jobs=2', diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm index d579d5c177..dd7b64e4c4 100644 --- a/src/test/perl/TestLib.pm +++ b/src/test/perl/TestLib.pm @@ -338,8 +338,14 @@ The return value from the command is passed through. sub run_log { - print("# Running: " . join(" ", @{ $_[0] }) . "\n"); - return IPC::Run::run(@_); + my @x = @{$_[0]}; + if (ref($x[0]) ne '') { + print("# Running: " . join(" ", @{ $x[0] }) . " @x[1,scalar(@x)-1]\n"); + return IPC::Run::run(@x); + } else { + print("# Running: " . join(" ", @{ $_[0] }) . "\n"); + return IPC::Run::run(@_); + } } =pod -- 2.24.2