about summary refs log tree commit homepage
path: root/lib/PublicInbox
diff options
context:
space:
mode:
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r--lib/PublicInbox/TestCommon.pm12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 532cbee6..68785969 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -65,11 +65,15 @@ sub require_mods {
         my @need;
         for my $mod (@mods) {
                 if ($mod eq 'Search::Xapian') {
-                        require PublicInbox::Search;
-                        PublicInbox::Search::load_xapian() and next;
+                        if (eval { require PublicInbox::Search } &&
+                                PublicInbox::Search::load_xapian()) {
+                                next;
+                        }
                 } elsif ($mod eq 'Search::Xapian::WritableDatabase') {
-                        require PublicInbox::SearchIdx;
-                        PublicInbox::SearchIdx::load_xapian_writable() and next;
+                        if (eval { require PublicInbox::SearchIdx } &&
+                                PublicInbox::SearchIdx::load_xapian_writable()){
+                                        next;
+                        }
                 } else {
                         eval "require $mod";
                 }