Remove REGRESS_OUTPUTDIR environment variable.

macdice · macdice · commit 7e6124ca7d81 · 2022-02-14T12:52:57.000+13:00
Andres Freund points out that the tmp_check path is already available as perl variable PostgreSQL::Test::Utils::tmp_check, so we can drop the new environment variable introduced by commit f47ed79. Discussion: https://postgr.es/m/20220213052955.dh7lheehit7bsemf%40alap3.anarazel.de
diff --git a/src/test/recovery/Makefile b/src/test/recovery/Makefile
@@ -19,10 +19,6 @@ include $(top_builddir)/src/Makefile.global
 REGRESS_SHLIB=$(abs_top_builddir)/src/test/regress/regress$(DLSUFFIX)
 export REGRESS_SHLIB
 
-# required for 027_stream_regress.pl
-REGRESS_OUTPUTDIR=$(abs_top_builddir)/src/test/recovery/tmp_check
-export REGRESS_OUTPUTDIR
-
 check:
 	$(prove_check)
 
diff --git a/src/test/recovery/t/027_stream_regress.pl b/src/test/recovery/t/027_stream_regress.pl
@@ -49,7 +49,7 @@
 $node_standby_1->start;
 
 my $dlpath = PostgreSQL::Test::Utils::perl2host(dirname($ENV{REGRESS_SHLIB}));
-my $outputdir = PostgreSQL::Test::Utils::perl2host($ENV{REGRESS_OUTPUTDIR});
+my $outputdir = PostgreSQL::Test::Utils::perl2host($PostgreSQL::Test::Utils::tmp_check);
 
 # Run the regression tests against the primary.
 my $extra_opts = $ENV{EXTRA_REGRESS_OPTS} || "";
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
@@ -536,8 +536,6 @@ sub recoverycheck
 {
 	InstallTemp();
 
-	$ENV{REGRESS_OUTPUTDIR} = "$topdir/src/test/recovery/tmp_check";
-
 	my $dir    = "$topdir/src/test/recovery";
 	my $status = tap_check($dir);
 	exit $status if $status;

Original file line number	Diff line number	Diff line change
`@@ -536,8 +536,6 @@ sub recoverycheck`
`536`	`536`	`{`
`537`	`537`	`InstallTemp();`
`538`	`538`
`539`		`- $ENV{REGRESS_OUTPUTDIR} = "$topdir/src/test/recovery/tmp_check";`
`540`		`-`
`541`	`539`	`my $dir = "$topdir/src/test/recovery";`
`542`	`540`	`my $status = tap_check($dir);`
`543`	`541`	`exit $status if $status;`