From bf989aaf35613ed2c2a66e120ca600e7b9da4f82 Mon Sep 17 00:00:00 2001
From: Noah Misch
Date: Wed, 5 Feb 2020 08:26:41 -0800
Subject: 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/PostgresNode.pm | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'src/test/perl/PostgresNode.pm')

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;
-- 
cgit v1.2.3