postgres.git / summary / log / commit / refs

commit    d8efc5900f7c0a952b7ff3f6e8d8ea2e77fe2986
Author:   Noah Misch <noah@leadboat.com>
Date:     Wed Feb 05 16:26:41 2020 +0000
First released in: 13.0, 9.6.17, 10.12, 11.7, 12.2

    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.GA3264196@rfd.leadboat.com


 src/test/perl/TestLib.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 73bf1a71165..24e7e0d1c99 100644
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -122,8 +122,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


[parent: 80dece684f86]