diff options
author | Eric Wong <e@yhbt.net> | 2020-06-14 00:25:03 +0000 |
---|---|---|
committer | Eric Wong <e@yhbt.net> | 2020-06-15 06:07:52 +0000 |
commit | 4042599799a3706d1b1c0589675b07cab610505a (patch) | |
tree | ca8cbd49ecbf6dd11ca4fd20e9fa275ec62a3886 | |
parent | fc6c7191daf71b8b1f6b45638ffcb1c6b2057636 (diff) | |
download | public-inbox-4042599799a3706d1b1c0589675b07cab610505a.tar.gz |
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.
-rw-r--r-- | lib/PublicInbox/TestCommon.pm | 11 | ||||
-rw-r--r-- | t/imap.t | 6 | ||||
-rw-r--r-- | t/imapd-tls.t | 3 | ||||
-rw-r--r-- | t/imapd.t | 3 | ||||
-rw-r--r-- | xt/imapd-mbsync-oimap.t | 1 | ||||
-rw-r--r-- | xt/imapd-validate.t | 2 | ||||
-rw-r--r-- | xt/mem-imapd-tls.t | 2 |
7 files changed, 20 insertions, 8 deletions
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 5e7dc8b0..a97125e5 100644 --- 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"; } @@ -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 5352d100..f81959a5 100644 --- 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'; @@ -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 c097a026..edf111fd 100644 --- 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 9a56c2d0..3e445156 100644 --- 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 accf7564..648a0ad3 100644 --- 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: { |