testcommon: allow OR-ing module dependencies

IMAP requires either the Email::Address::XS or Mail::Address
package (part of perl-MailTools RPM or libmailtools-perl deb);
and Email::Address::XS is not officially packaged for some older
distros, most notably CentOS 7.x.

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 5e7dc8b0d3fccb00524263ebafa9d61817300bd9..a97125e59850a391bcef929bf63b5b8acdc6395e 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -72,7 +72,7 @@ sub require_mods {
        my @mods = @_;
        my $maybe = pop @mods if $mods[-1] =~ /\A[0-9]+\z/;
        my @need;
-       for my $mod (@mods) {
+       while (my $mod = shift(@mods)) {
                if ($mod eq 'Search::Xapian') {
                        if (eval { require PublicInbox::Search } &&
                                PublicInbox::Search::load_xapian()) {
@@ -83,6 +83,15 @@ sub require_mods {
                                PublicInbox::SearchIdx::load_xapian_writable()){
                                        next;
                        }
+               } elsif (index($mod, '||') >= 0) { # "Foo||Bar"
+                       my $ok;
+                       for my $m (split(/\Q||\E/, $mod)) {
+                               eval "require $m";
+                               next if $@;
+                               $ok = $m;
+                               last;
+                       }
+                       next if $ok;
                } else {
                        eval "require $mod";
                }

diff --git a/t/imap.t b/t/imap.t
index 0700f5788cc6bd505a420e02dbfab098fb5738fa..83adf55338b99b8e6535958b93eafd9f278436d3 100644 (file)
--- a/t/imap.t
+++ b/t/imap.t
@@ -4,10 +4,10 @@
 # unit tests (no network) for IMAP, see t/imapd.t for end-to-end tests
 use strict;
 use Test::More;
-use PublicInbox::IMAP;
-use PublicInbox::IMAPD;
 use PublicInbox::TestCommon;
-require_mods(qw(DBD::SQLite));
+require_mods(qw(DBD::SQLite Email::Address::XS||Mail::Address));
+require_ok 'PublicInbox::IMAP';
+require_ok 'PublicInbox::IMAPD';
 require_git 2.6;
 use POSIX qw(strftime);
 

diff --git a/t/imapd-tls.t b/t/imapd-tls.t
index 5352d100e4b8517eba4192e894eba0b8337185b7..f81959a5826da3fe5729b77a340025a9234ebc7b 100644 (file)
--- a/t/imapd-tls.t
+++ b/t/imapd-tls.t
@@ -6,7 +6,8 @@ use Test::More;
 use Socket qw(IPPROTO_TCP SOL_SOCKET);
 use PublicInbox::TestCommon;
 # IO::Poll is part of the standard library, but distros may split it off...
-require_mods(qw(DBD::SQLite IO::Socket::SSL Mail::IMAPClient IO::Poll));
+require_mods(qw(DBD::SQLite IO::Socket::SSL Mail::IMAPClient IO::Poll
+       Email::Address::XS||Mail::Address));
 my $imap_client = 'Mail::IMAPClient';
 $imap_client->can('starttls') or
        plan skip_all => 'Mail::IMAPClient does not support TLS';

diff --git a/t/imapd.t b/t/imapd.t
index f5ca8b7eb03b2735be8c6cc5c56ddff7c0045014..0f48e905557baadd0eac5388be3609a2a4861ca1 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -8,7 +8,8 @@ use Time::HiRes ();
 use PublicInbox::TestCommon;
 use PublicInbox::Config;
 use PublicInbox::Spawn qw(which);
-require_mods(qw(DBD::SQLite Mail::IMAPClient Mail::IMAPClient::BodyStructure));
+require_mods(qw(DBD::SQLite Mail::IMAPClient Mail::IMAPClient::BodyStructure
+       Email::Address::XS||Mail::Address));
 my $imap_client = 'Mail::IMAPClient';
 my $can_compress = $imap_client->can('compress');
 if ($can_compress) { # hope this gets fixed upstream, soon

diff --git a/xt/imapd-mbsync-oimap.t b/xt/imapd-mbsync-oimap.t
index c097a0262f06f908189ed89477c0ea545dd55336..edf111fde3eca3a859abae89d206e7ed174b6025 100644 (file)
--- a/xt/imapd-mbsync-oimap.t
+++ b/xt/imapd-mbsync-oimap.t
@@ -7,6 +7,7 @@ use Test::More;
 use File::Path qw(mkpath);
 use PublicInbox::TestCommon;
 use PublicInbox::Spawn qw(which spawn);
+require_mods(qw(DBD::SQLite Email::Address::XS||Mail::Address));
 my $inboxdir = $ENV{GIANT_INBOX_DIR};
 (defined($inboxdir) && -d $inboxdir) or
        plan skip_all => "GIANT_INBOX_DIR not defined for $0";

diff --git a/xt/imapd-validate.t b/xt/imapd-validate.t
index 9a56c2d04c8fefc62aeead2f52da0bc1e6a1b193..3e44515650dcd794fa2b698e11af11e471112fdc 100644 (file)
--- a/xt/imapd-validate.t
+++ b/xt/imapd-validate.t
@@ -15,7 +15,7 @@ my $BATCH = $ENV{TEST_BATCH} // 100;
 my $REPEAT = $ENV{TEST_REPEAT} // 1;
 diag "TEST_BATCH=$BATCH TEST_REPEAT=$REPEAT";
 
-require_mods(qw(Mail::IMAPClient));
+require_mods(qw(Mail::IMAPClient Email::Address::XS||Mail::Address));
 my $imap_client = 'Mail::IMAPClient';
 my $can_compress = $imap_client->can('compress');
 if ($can_compress) { # hope this gets fixed upstream, soon

diff --git a/xt/mem-imapd-tls.t b/xt/mem-imapd-tls.t
index accf7564eddbe56b4ff9ce3ca2965f66fed42219..648a0ad3ae904b14b6f9648d2ade049dabaabde2 100644 (file)
--- a/xt/mem-imapd-tls.t
+++ b/xt/mem-imapd-tls.t
@@ -9,7 +9,7 @@ use Socket qw(SOCK_STREAM IPPROTO_TCP SOL_SOCKET);
 use PublicInbox::TestCommon;
 use PublicInbox::Syscall qw(:epoll);
 use PublicInbox::DS;
-require_mods(qw(DBD::SQLite));
+require_mods(qw(DBD::SQLite Email::Address::XS||Mail::Address));
 my $inboxdir = $ENV{GIANT_INBOX_DIR};
 my $TEST_TLS;
 SKIP: {