* [PATCH 4/5] t/search*: require DBI and DBD::SQLite, too
2019-05-22 2:13 6% [PATCH 0/5] fixes for CentOS 7 Eric Wong
@ 2019-05-22 2:14 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-05-22 2:14 UTC (permalink / raw)
To: meta
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
^ permalink raw reply related [relevance 7%]
* [PATCH 0/5] fixes for CentOS 7
@ 2019-05-22 2:13 6% Eric Wong
2019-05-22 2:14 7% ` [PATCH 4/5] t/search*: require DBI and DBD::SQLite, too Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-05-22 2:13 UTC (permalink / raw)
To: meta
Search::Xapian isn't available from the distro, but we can
support more things with only DBD::SQLite and DBI.
Eric Wong (5):
init: preserve permissions for git prior to 2.1.0
t/watch_filter_rubylang: disable v2 test for git < 2.6
git: workaround old git-rev-parse(1) (--git-path)
t/search*: require DBI and DBD::SQLite, too
ci: support CentOS-7
ci/deps.perl | 7 +++++++
ci/profiles.sh | 6 ++++++
lib/PublicInbox/Git.pm | 5 +++++
script/public-inbox-init | 12 +++++++++++-
t/search-thr-index.t | 7 +++++--
t/search.t | 7 +++++--
t/watch_filter_rubylang.t | 14 ++++++++++++--
7 files changed, 51 insertions(+), 7 deletions(-)
--
EW
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-05-22 2:13 6% [PATCH 0/5] fixes for CentOS 7 Eric Wong
2019-05-22 2:14 7% ` [PATCH 4/5] t/search*: require DBI and DBD::SQLite, too Eric Wong
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).