From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/5] t/search*: require DBI and DBD::SQLite, too
Date: Wed, 22 May 2019 02:14:01 +0000 [thread overview]
Message-ID: <20190522021402.24114-5-e@80x24.org> (raw)
In-Reply-To: <20190522021402.24114-1-e@80x24.org>
None of the Search::Xapian-dependent stuff works without DBI
and DBD::SQLite.
There are no plans to support Xapian w/o DBD::SQLite since
SQLite is more common and less resource-intensive than Xapian.
---
t/search-thr-index.t | 7 +++++--
t/search.t | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/t/search-thr-index.t b/t/search-thr-index.t
index 848dc56..1872af8 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 a9d0c92..c063620 100644
--- a/t/search.t
+++ b/t/search.t
@@ -3,8 +3,11 @@
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;
--
EW
next prev parent reply other threads:[~2019-05-22 2:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 2:13 [PATCH 0/5] fixes for CentOS 7 Eric Wong
2019-05-22 2:13 ` [PATCH 1/5] init: preserve permissions for git prior to 2.1.0 Eric Wong
2019-05-22 2:13 ` [PATCH 2/5] t/watch_filter_rubylang: disable v2 test for git < 2.6 Eric Wong
2019-05-22 2:14 ` [PATCH 3/5] git: workaround old git-rev-parse(1) (--git-path) Eric Wong
2019-05-22 2:14 ` Eric Wong [this message]
2019-05-22 2:14 ` [PATCH 5/5] ci: support CentOS-7 Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190522021402.24114-5-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).