rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix obsolete config-module-exclusion logic in vcregress.pl. 

The recent addition of regression tests to uuid-ossp exposed the fact
that the MSVC build system wasn't being consistent about whether it was
building/testing that contrib module, ie, it would try to test the module
even when it hadn't built it.  The same hazard was latent for sslinfo.

For the moment I just copied the more up-to-date logic from point A to
point B, but this is screaming for refactoring.

Per buildfarm results.
This commit is contained in:
Tom Lane 2014-05-27 22:31:21 -04:00
parent 4bcb394624
commit 8600031147
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/msvc/Install.pm
View File

@ -408,6 +408,7 @@ sub CopyContribFiles
next
if ($insttype eq "client" && !grep { $_ eq $d } @client_contribs);
# these configuration-based exclusions must match vcregress.pl
next if ($d eq "uuid-ossp" && !defined($config->{uuid}));
next if ($d eq "sslinfo" && !defined($config->{openssl}));
next if ($d eq "xml2" && !defined($config->{xml}));

8
src/tools/msvc/vcregress.pl
View File

@ -219,8 +219,12 @@ sub contribcheck
my $mstat = 0;
foreach my $module (glob("*"))
{
next if ($module eq 'sepgsql');
next if ($module eq 'xml2' && !$config->{xml});
# these configuration-based exclusions must match Install.pm
next if ($module eq "uuid-ossp" && !defined($config->{uuid}));
next if ($module eq "sslinfo" && !defined($config->{openssl}));
next if ($module eq "xml2" && !defined($config->{xml}));
next if ($module eq "sepgsql");
next
unless -d "$module/sql"
&& -d "$module/expected"