From: Michael Paquier <michael@paquier.xyz>
To: Andrew Dunstan <andrew@dunslane.net>
Cc: pgsql-committers@lists.postgresql.org
Subject: Re: pgsql: Remove command checks in tests of pg_basebackup and pg_receivewa
Date: Mon, 9 May 2022 14:28:17 +0900
Message-ID: <YnimcaZH0tpiHbMQ@paquier.xyz> (raw)
In-Reply-To: <YnW5vFw4tBqX6yRA@paquier.xyz>
References: <E1nJpf1-0003FC-Od@gemulon.postgresql.org>
<14402151-376b-a57a-6d0c-10ad12608e12@dunslane.net>
<Ym6IAq48gBBm5Ujv@paquier.xyz>
<12a044c9-e982-48d9-dd29-be1216a08805@dunslane.net>
<Ym+DAUUbc7LpseOf@paquier.xyz>
<5be02606-a9de-9252-5277-269cae0ad1f0@dunslane.net>
<YnW5vFw4tBqX6yRA@paquier.xyz>
Hi Andrew,
On Sat, May 07, 2022 at 09:13:48AM +0900, Michael Paquier wrote:
> Let's do that for now then as we need a middle ground for HEAD. I'll
> come up with something at the beginning of next week.
And here you go as of the attached to show the idea. The CI is able
to execute and detect the default commands for lz4, gzip and zstd,
while one of my boxes without any of those commands would ignore them.
What do you think?
--
Michael
Attachments:win32-vcregress-env.patch (text/x-diff, 2.3K) downloaddiff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.plindex fc7aa8b9a3..6e06686478 100644--- a/src/tools/msvc/vcregress.pl+++ b/src/tools/msvc/vcregress.pl@@ -31,12 +31,11 @@ do './src/tools/msvc/config_default.pl';
do './src/tools/msvc/config.pl' if (-f 'src/tools/msvc/config.pl');
# These values are defaults that can be overridden by the calling environment
-# (see buildenv.pl processing below).+# (see buildenv.pl processing below). We assume that the ones listed here+# always exist by default. Other values may optionally be set for bincheck or+# taptest, see set_command_env() below.
# c.f. src/Makefile.global.in and configure.ac
-$ENV{GZIP_PROGRAM} ||= 'gzip';-$ENV{LZ4} ||= 'lz4';
$ENV{TAR} ||= 'tar';
-$ENV{ZSTD} ||= 'zstd';
# buildenv.pl is for specifying the build environment settings
# it should contain lines like:
@@ -119,6 +118,41 @@ exit 0;
########################################################################
+# Helper function for set_command_env, to set one environment command.+sub set_single_env+{+ my $envname = shift;+ my $envdefault = shift;++ # If a command is defined by the environment, just use it.+ return if (defined($ENV{$envname}));++ # Nothing is defined, so attempt to assign a default. The command+ # may not be in the current environment, hence check if it can be+ # executed.+ my $rc = system($envdefault, '--version');+ if ($rc != 0)+ {+ # Execution of the default command failed, so reset its+ # environment value.+ $ENV{$envname} = '';+ return;+ }++ # Set the environment to the default as it exists.+ $ENV{$envname} = $envdefault;+ return;+}++# Set environment values for various command types. These can be used+# in the TAP tests.+sub set_command_env+{+ set_single_env('GZIP_PROGRAM', 'gzip');+ set_single_env('LZ4', 'lz4');+ set_single_env('ZSTD', 'zstd');+}+
sub installcheck_internal
{
my ($schedule, @EXTRA_REGRESS_OPTS) = @_;
@@ -276,6 +310,8 @@ sub bincheck
{
InstallTemp();
+ set_command_env();+
my $mstat = 0;
# Find out all the existing TAP tests by looking for t/ directories
@@ -310,6 +346,9 @@ sub taptest
push(@args, "$topdir/$dir");
InstallTemp();
++ set_command_env();+
my $status = tap_check(@args);
exit $status if $status;
return;
signature.asc (application/pgp-signature, 832B) download
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients from your mail client; the link fills in
the headers below: reply via email
Some clients, webmail especially, drop In-Reply-To and References from
a link, and the reply then starts a new thread: use the mbox below.
To: pgsql-committers@postgresql.org
Cc: michael@paquier.xyz, andrew@dunslane.net
Subject: Re: pgsql: Remove command checks in tests of pg_basebackup and pg_receivewa
In-Reply-To: <YnimcaZH0tpiHbMQ@paquier.xyz>
References: <E1nJpf1-0003FC-Od@gemulon.postgresql.org> <14402151-376b-a57a-6d0c-10ad12608e12@dunslane.net> <Ym6IAq48gBBm5Ujv@paquier.xyz> <12a044c9-e982-48d9-dd29-be1216a08805@dunslane.net> <Ym+DAUUbc7LpseOf@paquier.xyz> <5be02606-a9de-9252-5277-269cae0ad1f0@dunslane.net> <YnW5vFw4tBqX6yRA@paquier.xyz> <YnimcaZH0tpiHbMQ@paquier.xyz>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox