Skip to content

Commit edc2332

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 ed52c37 commit edc2332

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
@@ -59,6 +59,21 @@
5959
copy("$Config/regress/regress.dll", "src/test/regress");
6060
copy("$Config/dummy_seclabel/dummy_seclabel.dll", "src/test/regress");
6161

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

6479
if ($ENV{PERL5LIB})

0 commit comments

Comments
 (0)