You've already forked pgbackrest
mirror of
https://github.com/pgbackrest/pgbackrest.git
synced 2025-11-06 08:49:29 +02:00
Do not output stderr on unit/integration test errors.
Since stderr is being redirected to stdout this results in duplication of the error output.
This commit is contained in:
@@ -382,20 +382,9 @@ sub end
|
|||||||
# Output error
|
# Output error
|
||||||
if ($iExitStatus != 0 || (defined($oExecDone->{strErrorLog}) && $oExecDone->{strErrorLog} ne ''))
|
if ($iExitStatus != 0 || (defined($oExecDone->{strErrorLog}) && $oExecDone->{strErrorLog} ne ''))
|
||||||
{
|
{
|
||||||
# Get stdout
|
# Get stdout (no need to get stderr since stderr is redirected to stdout)
|
||||||
my $strOutput = trim($oExecDone->{strOutLog}) ? "STDOUT:\n" . trim($oExecDone->{strOutLog}) : '';
|
my $strOutput = trim($oExecDone->{strOutLog}) ? "STDOUT:\n" . trim($oExecDone->{strOutLog}) : '';
|
||||||
|
|
||||||
# Get stderr
|
|
||||||
if (defined($oExecDone->{strErrorLog}) && trim($oExecDone->{strErrorLog}) ne '')
|
|
||||||
{
|
|
||||||
if ($strOutput ne '')
|
|
||||||
{
|
|
||||||
$strOutput .= "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
$strOutput .= "STDERR:\n" . trim($oExecDone->{strErrorLog});
|
|
||||||
}
|
|
||||||
|
|
||||||
# If no stdout or stderr output something rather than a blank line
|
# If no stdout or stderr output something rather than a blank line
|
||||||
if ($strOutput eq '')
|
if ($strOutput eq '')
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user