From 4042599799a3706d1b1c0589675b07cab610505a Mon Sep 17 00:00:00 2001
From: Eric Wong <e@yhbt.net>
Date: Sun, 14 Jun 2020 00:25:03 +0000
Subject: 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.
---
 xt/imapd-mbsync-oimap.t | 1 +
 xt/imapd-validate.t     | 2 +-
 xt/mem-imapd-tls.t      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'xt')

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: {
-- 
cgit v1.2.3-24-ge0c7