index 32825414f8e8242cfce6cf8ccf505da592f940e0..bbb31d3a0d1776d1d6d2e66c9c9de7721e119402 100644 (file)
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
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;
index d6fe26c03694694618f4dcab704490cdceadb96e..9981265766966c3fa3059508beba47a2f9a8f180 100644 (file)
END
{
- # Preserve temporary directory for this test on failure
- $File::Temp::KEEP_ALL = 1 unless all_tests_passing();
+ # Test files have several ways of causing prove_check to fail:
+ # 1. Exit with a non-zero status.
+ # 2. Call ok(0) or similar, indicating that a constituent test failed.
+ # 3. Deviate from the planned number of tests.
+ #
+ # Preserve temporary directories after (1) and after (2).
+ $File::Temp::KEEP_ALL = 1 unless $? == 0 && all_tests_passing();
}
sub all_tests_passing