Skip to content

Commit 14c54e4

Browse files
committed
Enable settings used in TAP tests for MSVC builds
Certain settings from configuration or the Makefile infrastructure are used by the TAP tests, but were not being set up by vcregress.pl. This remedies those omissions. This should increase test coverage, especially on the buildfarm. Reviewed by Noah Misch Discussion: https://postgr.es/m/17093da5-e40d-8335-d53a-2bd803fc38b0@dunslane.net Backpatch to all live branches.
1 parent a8a983e commit 14c54e4

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

src/tools/msvc/vcregress.pl

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,21 @@
5757
copy("$Config/regress/regress.dll", "src/test/regress");
5858
copy("$Config/dummy_seclabel/dummy_seclabel.dll", "src/test/regress");
5959

60+
# Configuration settings used by TAP tests
61+
$ENV{with_openssl} = $config->{openssl} ? 'yes' : 'no';
62+
$ENV{with_ldap} = $config->{ldap} ? 'yes' : 'no';
63+
$ENV{with_icu} = $config->{icu} ? 'yes' : 'no';
64+
$ENV{with_gssapi} = $config->{gss} ? 'yes' : 'no';
65+
$ENV{with_krb_srvnam} = $config->{krb_srvnam} || 'postgres';
66+
$ENV{with_readline} = 'no';
67+
68+
# These values are defaults that can be overridden by the calling environment
69+
# (see buildenv.pl processing above).
70+
# c.f. src/Makefile.global.in and configure.ac
71+
$ENV{TAR} ||= 'tar';
72+
$ENV{LZ4} ||= 'lz4';
73+
$ENV{GZIP_PROGRAM} ||= 'gzip';
74+
6075
$ENV{PATH} = "$topdir/$Config/libpq;$ENV{PATH}";
6176

6277
if ($ENV{PERL5LIB})

0 commit comments

Comments
 (0)