postgres.git / summary / log / commit / refs

commit    edc2332550b2343bc9378540e11c8aa71f513a63
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Tue Dec 07 19:53:39 2021 +0000

    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.


 src/tools/msvc/vcregress.pl | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index f3357b32920..5975e7c9cdd 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -59,6 +59,21 @@ copy("$Config/autoinc/autoinc.dll",               "src/test/regress");
 copy("$Config/regress/regress.dll",               "src/test/regress");
 copy("$Config/dummy_seclabel/dummy_seclabel.dll", "src/test/regress");
 
+# Configuration settings used by TAP tests
+$ENV{with_ssl} = $config->{openssl} ? 'openssl' : 'no';
+$ENV{with_ldap} = $config->{ldap} ? 'yes' : 'no';
+$ENV{with_icu} = $config->{icu} ? 'yes' : 'no';
+$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: ed52c3707bcf]