Skip to content

Commit da57b15

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 23bc57d commit da57b15

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
@@ -55,6 +55,21 @@
5555
copy("$Config/regress/regress.dll", "src/test/regress");
5656
copy("$Config/dummy_seclabel/dummy_seclabel.dll", "src/test/regress");
5757

58+
# Configuration settings used by TAP tests
59+
$ENV{with_openssl} = $config->{openssl} ? 'yes' : 'no';
60+
$ENV{with_ldap} = $config->{ldap} ? 'yes' : 'no';
61+
$ENV{with_icu} = $config->{icu} ? 'yes' : 'no';
62+
$ENV{with_gssapi} = $config->{gss} ? 'yes' : 'no';
63+
$ENV{with_krb_srvnam} = $config->{krb_srvnam} || 'postgres';
64+
$ENV{with_readline} = 'no';
65+
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+
5873
$ENV{PATH} = "$topdir/$Config/libpq;$ENV{PATH}";
5974

6075
if ($ENV{PERL5LIB})

0 commit comments

Comments
 (0)