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.

1 files changed, 10 insertions, 1 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";
                 }