When a TAP file has non-zero exit status, retain temporary directories.

nmisch · nmisch · commit d8efc5900f7c · 2020-02-05T08:27:02.000-08:00
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 88802e0 introduced retention on failure. Reviewed by Daniel Gustafsson. Discussion: https://postgr.es/m/20200202170155.GA3264196@rfd.leadboat.com
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,13 @@ INIT`
`122`	`122`	`END`
`123`	`123`	`{`
`124`	`124`
`125`		`- # Preserve temporary directory for this test on failure`
`126`		`- $File::Temp::KEEP_ALL = 1 unless all_tests_passing();`
	`125`	`+ # Test files have several ways of causing prove_check to fail:`
	`126`	`+ # 1. Exit with a non-zero status.`
	`127`	`+ # 2. Call ok(0) or similar, indicating that a constituent test failed.`
	`128`	`+ # 3. Deviate from the planned number of tests.`
	`129`	`+ #`
	`130`	`+ # Preserve temporary directories after (1) and after (2).`
	`131`	`+ $File::Temp::KEEP_ALL = 1 unless $? == 0 && all_tests_passing();`
`127`	`132`	`}`
`128`	`133`
`129`	`134`	`sub all_tests_passing`