Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8600031

Browse files
committed
Fix obsolete config-module-exclusion logic in vcregress.pl.
The recent addition of regression tests to uuid-ossp exposed the factthat the MSVC build system wasn't being consistent about whether it wasbuilding/testing that contrib module, ie, it would try to test the moduleeven 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 topoint B, but this is screaming for refactoring.Per buildfarm results.
1 parent4bcb394 commit8600031

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

‎src/tools/msvc/Install.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@ sub CopyContribFiles
408408
next
409409
if ($insttypeeq"client" && !grep {$_eq$d }@client_contribs);
410410

411+
# these configuration-based exclusions must match vcregress.pl
411412
nextif ($deq"uuid-ossp" && !defined($config->{uuid}));
412413
nextif ($deq"sslinfo" && !defined($config->{openssl}));
413414
nextif ($deq"xml2" && !defined($config->{xml}));

‎src/tools/msvc/vcregress.pl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,12 @@ sub contribcheck
219219
my$mstat = 0;
220220
foreachmy$module (glob("*"))
221221
{
222-
nextif ($moduleeq'sepgsql');
223-
nextif ($moduleeq'xml2' && !$config->{xml});
222+
# these configuration-based exclusions must match Install.pm
223+
nextif ($moduleeq"uuid-ossp" && !defined($config->{uuid}));
224+
nextif ($moduleeq"sslinfo" && !defined($config->{openssl}));
225+
nextif ($moduleeq"xml2" && !defined($config->{xml}));
226+
nextif ($moduleeq"sepgsql");
227+
224228
next
225229
unless-d"$module/sql"
226230
&&-d"$module/expected"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp