Commit 86000311 authored by Tom Lane's avatar Tom Lane

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.
parent 4bcb3946
...@@ -408,6 +408,7 @@ sub CopyContribFiles ...@@ -408,6 +408,7 @@ sub CopyContribFiles
next next
if ($insttype eq "client" && !grep { $_ eq $d } @client_contribs); 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 "uuid-ossp" && !defined($config->{uuid}));
next if ($d eq "sslinfo" && !defined($config->{openssl})); next if ($d eq "sslinfo" && !defined($config->{openssl}));
next if ($d eq "xml2" && !defined($config->{xml})); next if ($d eq "xml2" && !defined($config->{xml}));
......
...@@ -219,8 +219,12 @@ sub contribcheck ...@@ -219,8 +219,12 @@ sub contribcheck
my $mstat = 0; my $mstat = 0;
foreach my $module (glob("*")) foreach my $module (glob("*"))
{ {
next if ($module eq 'sepgsql'); # these configuration-based exclusions must match Install.pm
next if ($module eq 'xml2' && !$config->{xml}); 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 next
unless -d "$module/sql" unless -d "$module/sql"
&& -d "$module/expected" && -d "$module/expected"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment