Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/perl/PostgresNode.pm')
-rw-r--r--src/test/perl/PostgresNode.pm17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index bf095a7adb7..9575268bd77 100644
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -1233,20 +1233,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
@@ -1265,8 +1251,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;