Make PG_TEST_NOCLEAN work for temporary directories in TAP tests

michaelpq · michaelpq · commit af36c13a7e92 · 2023-07-03T10:06:19.000+09:00
When set, this environment variable was only effective for data directories but not for all the other temporary files created by PostgreSQL::Test::Utils. Keeping the temporary files after a successful run can be useful for debugging purposes. The documentation is updated to reflect the new behavior, with contents available in doc/ since v16 and in src/test/perl/README since v15. Author: Jacob Champion Reviewed-by: Daniel Gustafsson Discussion: https://postgr.es/m/CAAWbhmgHtDH1SGZ+Fw05CsXtE0mzTmjbuUxLB9mY9iPKgM6cUw@mail.gmail.com Discussion: https://postgr.es/m/YyPd9unV14SX2bLF@paquier.xyz Backpatch-through: 11
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
@@ -187,15 +187,16 @@ sub tempdir
 	return File::Temp::tempdir(
 		$prefix . '_XXXX',
 		DIR     => $tmp_check,
-		CLEANUP => 1);
+		CLEANUP => not defined $ENV{'PG_TEST_NOCLEAN'});
 }
 
 sub tempdir_short
 {
 
 	# Use a separate temp dir outside the build tree for the
 	# Unix-domain socket, to avoid file name length issues.
-	return File::Temp::tempdir(CLEANUP => 1);
+	return File::Temp::tempdir(
+		CLEANUP => not defined $ENV{'PG_TEST_NOCLEAN'});
 }
 
 =pod

Original file line number	Diff line number	Diff line change
`@@ -187,15 +187,16 @@ sub tempdir`
`187`	`187`	`return File::Temp::tempdir(`
`188`	`188`	`$prefix . '_XXXX',`
`189`	`189`	`DIR => $tmp_check,`
`190`		`- CLEANUP => 1);`
	`190`	`+ CLEANUP => not defined $ENV{'PG_TEST_NOCLEAN'});`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`sub tempdir_short`
`194`	`194`	`{`
`195`	`195`
`196`	`196`	`# Use a separate temp dir outside the build tree for the`
`197`	`197`	`# Unix-domain socket, to avoid file name length issues.`
`198`		`- return File::Temp::tempdir(CLEANUP => 1);`
	`198`	`+ return File::Temp::tempdir(`
	`199`	`+ CLEANUP => not defined $ENV{'PG_TEST_NOCLEAN'});`
`199`	`200`	`}`
`200`	`201`
`201`	`202`	`=pod`