From: Thomas Munro Date: Sun, 13 Feb 2022 23:52:57 +0000 (+1300) Subject: Remove REGRESS_OUTPUTDIR environment variable. X-Git-Tag: REL_15_BETA1~725 X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=7e6124ca7d81f4767a44bae487226bc8b003ec31;p=postgresql.git Remove REGRESS_OUTPUTDIR environment variable. 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 f47ed79cc. Discussion: https://postgr.es/m/20220213052955.dh7lheehit7bsemf%40alap3.anarazel.de --- diff --git a/src/test/recovery/Makefile b/src/test/recovery/Makefile index 4eb12e05838..da5b9ff397c 100644 --- 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 index c0aae707ea1..4f82a54f933 100644 --- 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->append_conf('postgresql.conf', $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 index ddce4680a94..a9946262398 100644 --- 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;