postgres.git / summary / log / commit / refs

commit    4ddbd7456a2d1a2f06f0860151bcbc720bf75e55
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Wed Dec 15 01:40:08 2021 +0000

    Adjust behavior of some env settings for the TAP tests of MSVC
    
    edc2332 has introduced in vcregress.pl some control on the environment
    variables LZ4, TAR and GZIP_PROGRAM to allow any TAP tests to be able
    use those commands.  This makes the settings more consistent with
    src/Makefile.global.in, as the same default gets used for Make and MSVC
    builds.
    
    Each parameter can be changed in buildenv.pl, but as a default gets
    assigned after loading buldenv.pl, it is not possible to unset any of
    these, and using an empty value would not work with "||=" either.  As
    some environments may not have a compatible command in their PATH (tar
    coming from MinGW is an issue, for one), this could break tests without
    an exit path to bypass any failing test.  This commit changes things so
    as the default values for LZ4, TAR and GZIP_PROGRAM are assigned before
    loading buildenv.pl, not after.  This way, we keep the same amount of
    compatibility as a GNU build with the same defaults, and it becomes
    possible to unset any of those values.
    
    While on it, this adds some documentation about those three variables in
    the section dedicated to the TAP tests for MSVC.
    
    Per discussion with Andrew Dunstan.
    
    Discussion: https://postgr.es/m/YbGYe483803il3X7@paquier.xyz
    Backpatch-through: 10


 doc/src/sgml/install-windows.sgml | 34 ++++++++++++++++++++++++++++++++++
 src/tools/msvc/vcregress.pl       | 14 +++++++-------
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index 940836a4d44..4ba220d1a22 100644
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -517,6 +517,40 @@ $ENV{PROVE_FLAGS}='--timer --jobs 2'
 $ENV{PROVE_TESTS}='t/020*.pl t/010*.pl'
 </programlisting>
   </para>
+
+  <para>
+   Some of the TAP tests depend on a set of external commands that would
+   optionally trigger tests related to them. Each one of those variables
+   can be set or unset in <filename>buildenv.pl</filename>:
+   <variablelist>
+    <varlistentry>
+     <term><varname>GZIP_PROGRAM</varname></term>
+     <listitem><para>
+       Path to a <application>gzip</application> command. The default is
+       <literal>gzip</literal>, that would be the command found in
+      <varname>PATH</varname>.
+     </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><varname>LZ4</varname></term>
+     <listitem><para>
+      Path to a <application>lz4</application> command. The default is
+      <literal>lz4</literal>, that would be the command found in
+      <varname>PATH</varname>.
+     </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><varname>TAR</varname></term>
+     <listitem><para>
+      Path to a <application>tar</application> command. The default is
+      <literal>tar</literal>, that would be the command found in
+      <varname>PATH</varname>.
+     </para></listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
  </sect2>
 
  </sect1>
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 9e85849050b..03a5d976afb 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -30,6 +30,13 @@ my $tmp_installdir = "$topdir/tmp_install";
 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).
+# c.f. src/Makefile.global.in and configure.ac
+$ENV{GZIP_PROGRAM} ||= 'gzip';
+$ENV{LZ4} ||= 'lz4';
+$ENV{TAR} ||= 'tar';
+
 # buildenv.pl is for specifying the build environment settings
 # it should contain lines like:
 # $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}";
@@ -67,13 +74,6 @@ $ENV{with_gssapi} = $config->{gss} ? 'yes' : 'no';
 $ENV{with_krb_srvnam} = $config->{krb_srvnam} || 'postgres';
 $ENV{with_readline} = 'no';
 
-# These values are defaults that can be overridden by the calling environment
-# (see buildenv.pl processing above).
-# c.f. src/Makefile.global.in and configure.ac
-$ENV{TAR} ||= 'tar';
-$ENV{LZ4} ||= 'lz4';
-$ENV{GZIP_PROGRAM} ||= 'gzip';
-
 $ENV{PATH} = "$topdir/$Config/libpq;$ENV{PATH}";
 
 if ($ENV{PERL5LIB})


[parent: 25c7faa1feee]