Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf04aa65

Browse files
committed
Adjust behavior of some env settings for the TAP tests of MSVC
edc2332 has introduced in vcregress.pl some control on the environmentvariables LZ4, TAR and GZIP_PROGRAM to allow any TAP tests to be ableuse those commands. This makes the settings more consistent withsrc/Makefile.global.in, as the same default gets used for Make and MSVCbuilds.Each parameter can be changed in buildenv.pl, but as a default getsassigned after loading buldenv.pl, it is not possible to unset any ofthese, and using an empty value would not work with "||=" either. Assome environments may not have a compatible command in their PATH (tarcoming from MinGW is an issue, for one), this could break tests withoutan exit path to bypass any failing test. This commit changes things soas the default values for LZ4, TAR and GZIP_PROGRAM are assigned beforeloading buildenv.pl, not after. This way, we keep the same amount ofcompatibility as a GNU build with the same defaults, and it becomespossible to unset any of those values.While on it, this adds some documentation about those three variables inthe section dedicated to the TAP tests for MSVC.Per discussion with Andrew Dunstan.Discussion:https://postgr.es/m/YbGYe483803il3X7@paquier.xyzBackpatch-through: 10
1 parent65af1e8 commitf04aa65

File tree

2 files changed

+41
-7
lines changed

2 files changed

+41
-7
lines changed

‎doc/src/sgml/install-windows.sgml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,40 @@ $ENV{PERL5LIB}=$ENV{PERL5LIB} . ';c:\IPC-Run-0.94\lib';
497497
</varlistentry>
498498
</variablelist>
499499
</para>
500+
501+
<para>
502+
Some of the TAP tests depend on a set of external commands that would
503+
optionally trigger tests related to them. Each one of those variables
504+
can be set or unset in <filename>buildenv.pl</filename>:
505+
<variablelist>
506+
<varlistentry>
507+
<term><varname>GZIP_PROGRAM</varname></term>
508+
<listitem><para>
509+
Path to a <application>gzip</application> command. The default is
510+
<literal>gzip</literal>, that would be the command found in
511+
<varname>PATH</varname>.
512+
</para></listitem>
513+
</varlistentry>
514+
515+
<varlistentry>
516+
<term><varname>LZ4</varname></term>
517+
<listitem><para>
518+
Path to a <application>lz4</application> command. The default is
519+
<literal>lz4</literal>, that would be the command found in
520+
<varname>PATH</varname>.
521+
</para></listitem>
522+
</varlistentry>
523+
524+
<varlistentry>
525+
<term><varname>TAR</varname></term>
526+
<listitem><para>
527+
Path to a <application>tar</application> command. The default is
528+
<literal>tar</literal>, that would be the command found in
529+
<varname>PATH</varname>.
530+
</para></listitem>
531+
</varlistentry>
532+
</variablelist>
533+
</para>
500534
</sect2>
501535

502536
</sect1>

‎src/tools/msvc/vcregress.pl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626
do'./src/tools/msvc/config_default.pl';
2727
do'./src/tools/msvc/config.pl'if (-f'src/tools/msvc/config.pl');
2828

29+
# These values are defaults that can be overridden by the calling environment
30+
# (see buildenv.pl processing below).
31+
# c.f. src/Makefile.global.in and configure.ac
32+
$ENV{GZIP_PROGRAM} ||='gzip';
33+
$ENV{LZ4} ||='lz4';
34+
$ENV{TAR} ||='tar';
35+
2936
# buildenv.pl is for specifying the build environment settings
3037
# it should contain lines like:
3138
# $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}";
@@ -63,13 +70,6 @@
6370
$ENV{with_krb_srvnam} =$config->{krb_srvnam} ||'postgres';
6471
$ENV{with_readline} ='no';
6572

66-
# These values are defaults that can be overridden by the calling environment
67-
# (see buildenv.pl processing above).
68-
# c.f. src/Makefile.global.in and configure.ac
69-
$ENV{TAR} ||='tar';
70-
$ENV{LZ4} ||='lz4';
71-
$ENV{GZIP_PROGRAM} ||='gzip';
72-
7373
$ENV{PATH} ="$topdir/$Config/libpq;$ENV{PATH}";
7474

7575
if ($ENV{PERL5LIB})

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp