mirror of
https://github.com/postgres/postgres.git
synced 2025-07-18 17:42:25 +03:00
When a TAP file has non-zero exit status, retain temporary directories.
PostgresNode already retained base directories in such cases. Stop
using $SIG{__DIE__}, which is redundant with the exit status check, in
lieu of proliferating it to TestLib. Back-patch to 9.6, where commit
88802e0680
introduced retention on
failure.
Reviewed by Daniel Gustafsson.
Discussion: https://postgr.es/m/20200202170155.GA3264196@rfd.leadboat.com
This commit is contained in:
@ -1206,20 +1206,6 @@ sub can_bind
|
||||
return $ret;
|
||||
}
|
||||
|
||||
# Retain the errno on die() if set, else assume a generic errno of 1.
|
||||
# This will instruct the END handler on how to handle artifacts left
|
||||
# behind from tests.
|
||||
$SIG{__DIE__} = sub {
|
||||
if ($!)
|
||||
{
|
||||
$died = $!;
|
||||
}
|
||||
else
|
||||
{
|
||||
$died = 1;
|
||||
}
|
||||
};
|
||||
|
||||
# Automatically shut down any still-running nodes when the test script exits.
|
||||
# Note that this just stops the postmasters (in the same order the nodes were
|
||||
# created in). Any temporary directories are deleted, in an unspecified
|
||||
@ -1238,8 +1224,7 @@ END
|
||||
next if defined $ENV{'PG_TEST_NOCLEAN'};
|
||||
|
||||
# clean basedir on clean test invocation
|
||||
$node->clean_node
|
||||
if TestLib::all_tests_passing() && !defined $died && !$exit_code;
|
||||
$node->clean_node if $exit_code == 0 && TestLib::all_tests_passing();
|
||||
}
|
||||
|
||||
$? = $exit_code;
|
||||
|
Reference in New Issue
Block a user