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
88802e068017bee8cea7a5502a712794e761c7b5 introduced retention on
failure.

Reviewed by Daniel Gustafsson.

Discussion: https://postgr.es/m/20200202170155[email protected]

diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index 270bd6c8566b9f431b3ffcc92ede05c49442eb12..af13c320e9cca447dde89ef0844c06d4aec37312 100644 (file)
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -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;

diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 4c3f60849437fca43e9e0a2948fcde23d4fcb114..9006b5478bffc6e551bed8bb87f133be880b049d 100644 (file)
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -131,8 +131,13 @@ INIT
 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