about summary refs log tree commit homepage
path: root/lib/PublicInbox
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2020-01-04 21:37:52 +0000
committerEric Wong <e@80x24.org>2020-01-04 22:08:08 +0000
commitcb850caf867e3e6920233c1c1ab7120cac054af8 (patch)
tree3fae0ca287eb514312cecd441ebda7b3ec6e7426 /lib/PublicInbox
parent9c6dbb636ae2738c4b5d5b96752b7433be0d7b62 (diff)
downloadpublic-inbox-cb850caf867e3e6920233c1c1ab7120cac054af8.tar.gz
PublicInbox::Search always loads DBD::SQLite, so we
can't blindly "use" it in t/xcpdb-reshard.t.  We also
need to account for that in TestCommon.
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";
                 }