t/search-thr-index.t | 7 +++++-- t/search.t | 7 +++++-- diff --git a/t/search-thr-index.t b/t/search-thr-index.t index 848dc56459d5acf23c64dacf6f2726e359007b29..1872af84e124430ee02b826f57e00b7045d52b4a 100644 --- a/t/search-thr-index.t +++ b/t/search-thr-index.t @@ -7,8 +7,11 @@ use Test::More; use File::Temp qw/tempdir/; use PublicInbox::MID qw(mids); use Email::MIME; -eval { require Search::Xapian }; -plan skip_all => "Search::Xapian missing for search" if $@; +my @mods = qw(DBI DBD::SQLite Search::Xapian); +foreach my $mod (@mods) { + eval "require $mod"; + plan skip_all => "missing $mod for $0" if $@; +} require PublicInbox::SearchIdx; my $tmpdir = tempdir('pi-search-thr-index.XXXXXX', TMPDIR => 1, CLEANUP => 1); my $git_dir = "$tmpdir/a.git"; diff --git a/t/search.t b/t/search.t index a9d0c92030e1a936a5e7d5a77b4b22c65d5645c1..c063620c4d1a52b051bfc800057ed7f877d5f7fa 100644 --- a/t/search.t +++ b/t/search.t @@ -3,8 +3,11 @@ # License: AGPL-3.0+ use strict; use warnings; use Test::More; -eval { require Search::Xapian }; -plan skip_all => "Search::Xapian missing for search" if $@; +my @mods = qw(DBI DBD::SQLite Search::Xapian); +foreach my $mod (@mods) { + eval "require $mod"; + plan skip_all => "missing $mod for $0" if $@; +}; require PublicInbox::SearchIdx; use File::Temp qw/tempdir/; use Email::MIME;