tests: guard against missing DBD::SQLite

The features we use for SharedKV could probably be implemented
with GDBM_File or SDBM_File, but that doesn't seem worth it at
the moment since we depend on SQLite elsewhere.

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 4f63bc937667d04a468d4152256ef99164d69d17..a4b1756da1b4934809553a3de3d4178864de0944 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -496,7 +496,7 @@ EOF
 
 sub _fill_ei ($$) {
        my ($self, $pfx) = @_;
-       require PublicInbox::ExtSearch;
+       eval { require PublicInbox::ExtSearch } or return;
        my $d = $self->{"$pfx.topdir"};
        defined($d) && -d $d ? PublicInbox::ExtSearch->new($d) : undef;
 }

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index bee44f8a92e7ae8861b01064ff10831605b51a1f..a1e34797e77d4eaa654e65ec259e7aefee46f020 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -196,7 +196,7 @@ sub isrch { $_[0]->{isrch} // search($_[0]) }
 
 sub over {
        $_[0]->{over} //= eval {
-               my $srch = $_[0]->{search} //= eval {
+               my $srch = $_[0]->{search} //= do {
                        _cleanup_later($_[0]);
                        require PublicInbox::Search;
                        PublicInbox::Search->new($_[0]);

diff --git a/lib/PublicInbox/LeiDedupe.pm b/lib/PublicInbox/LeiDedupe.pm
index 5c83fd8007ce55438f989ebd3a2bc835d05b7373..2114c0e8629bb75822c9b7d5ce663d259542cbb4 100644 (file)
--- a/lib/PublicInbox/LeiDedupe.pm
+++ b/lib/PublicInbox/LeiDedupe.pm
@@ -3,7 +3,6 @@
 package PublicInbox::LeiDedupe;
 use strict;
 use v5.10.1;
-use PublicInbox::SharedKV;
 use PublicInbox::ContentHash qw(content_hash);
 use Digest::SHA ();
 
@@ -98,8 +97,11 @@ sub new {
        return if ($dd eq 'none' && substr($dst // '', -1) eq '/');
        my $m = "dedupe_$dd";
        $cls->can($m) or die "unsupported dedupe strategy: $dd\n";
-       my $skv = $dd eq 'none' ? undef : PublicInbox::SharedKV->new;
-
+       my $skv;
+       if ($dd ne 'none') {
+               require PublicInbox::SharedKV;
+               $skv = PublicInbox::SharedKV->new;
+       }
        # [ $skv, $eml_cb, $smsg_cb, "dedupe_$dd" ]
        bless [ $skv, undef, undef, $m ], $cls;
 }

diff --git a/t/extsearch.t b/t/extsearch.t
index 2c3f7547f76f2e17118326b75271c5fc4cb27c37..26c3d4ae72ece18d18297478b77d6ed3e0e5443e 100644 (file)
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -5,11 +5,11 @@ use strict;
 use Test::More;
 use PublicInbox::TestCommon;
 use PublicInbox::Config;
-use PublicInbox::Search;
 use PublicInbox::InboxWritable;
 use Fcntl qw(:seek);
 require_git(2.6);
 require_mods(qw(json DBD::SQLite Search::Xapian));
+require PublicInbox::Search;
 use_ok 'PublicInbox::ExtSearch';
 use_ok 'PublicInbox::ExtSearchIdx';
 use_ok 'PublicInbox::OverIdx';

diff --git a/t/lei_overview.t b/t/lei_overview.t
index 896cc01a87fd8fca8805f17e4138ec015576c8da..dd9e2cadcbae49a7c06af2241d93144f1332c006 100644 (file)
--- a/t/lei_overview.t
+++ b/t/lei_overview.t
@@ -6,6 +6,7 @@ use v5.10.1;
 use Test::More;
 use PublicInbox::TestCommon;
 use POSIX qw(_exit);
+require_mods(qw(Search::Xapian DBD::SQLite));
 require_ok 'PublicInbox::LeiOverview';
 
 my $ovv = bless {}, 'PublicInbox::LeiOverview';

diff --git a/t/lei_xsearch.t b/t/lei_xsearch.t
index f745ea3e2bfba9566a73cf560fd091733b41b383..f865ff436ae292a2437b7694589d5d3d9298cd1d 100644 (file)
--- a/t/lei_xsearch.t
+++ b/t/lei_xsearch.t
@@ -6,10 +6,10 @@ use v5.10.1;
 use Test::More;
 use List::Util qw(shuffle max);
 use PublicInbox::TestCommon;
-use PublicInbox::ExtSearchIdx;
 use PublicInbox::Eml;
 use PublicInbox::InboxWritable;
 require_mods(qw(DBD::SQLite Search::Xapian));
+require PublicInbox::ExtSearchIdx;
 require_git 2.6;
 require_ok 'PublicInbox::LeiXSearch';
 my ($home, $for_destroy) = tmpdir();

diff --git a/t/shared_kv.t b/t/shared_kv.t
index fcae688a31dd403b2b87b9e7f03fcd7d571c2720..251b7f3942c88eceb36785f5e486fbdd4fb58cdf 100644 (file)
--- a/t/shared_kv.t
+++ b/t/shared_kv.t
@@ -5,6 +5,7 @@ use strict;
 use v5.10.1;
 use Test::More;
 use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite));
 use_ok 'PublicInbox::SharedKV';
 my ($tmpdir, $for_destroy) = tmpdir();
 local $ENV{TMPDIR} = $tmpdir;