postgres.git / summary / log / commit / refs

commit    f99cd8bb0dab7512b7980472bdd5883dee8c4588
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Tue Dec 07 20:05:33 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 4432c7cb73a..68837de1807 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -55,6 +55,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_openssl} = $config->{openssl} ? 'yes' : '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: 878f38b80e91]