diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-05-27 22:31:21 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-05-27 22:31:21 -0400 |
| commit | 8600031147cee7845e1ad9e64304e1f5fe585515 (patch) | |
| tree | ecc422263a78bdc59397f5c639f6c300a444c09f /src | |
| parent | 4bcb3946249cbeed157ffd545a804913cfce749b (diff) | |
| download | postgresql-8600031147cee7845e1ad9e64304e1f5fe585515.tar.gz postgresql-8600031147cee7845e1ad9e64304e1f5fe585515.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/Install.pm | 1 | ||||
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 55de9e55e6b..ce17f72ec5a 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -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})); diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 1b0c9d4c0f7..2c8cd50a2f7 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -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" |