diff options
author | Eric Wong <e@yhbt.net> | 2020-09-14 06:29:26 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2020-09-14 21:29:56 +0000 |
commit | 23eab6127c62d0228a0cfcec78a267fe5e7011c7 (patch) | |
tree | b0a0d8e3cfe2a279e81fd775bf85838b8c9dfd53 /lib/PublicInbox/TestCommon.pm | |
parent | ee8cadb3a71ab4c951642a96ba123688244de720 (diff) | |
download | public-inbox-23eab6127c62d0228a0cfcec78a267fe5e7011c7.tar.gz |
We may need to test against development versions of Xapian, which may rely on setting `XAPIAN_COMPACT=xapian-compact-1.5'. Ensure it's possible to do that. And add a missing check in t/xcpdb-reshard.t, too.
Diffstat (limited to 'lib/PublicInbox/TestCommon.pm')
-rw-r--r-- | lib/PublicInbox/TestCommon.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 42819179..299b9c6a 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -10,7 +10,8 @@ use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD :seek); use POSIX qw(dup2); use IO::Socket::INET; our @EXPORT = qw(tmpdir tcp_server tcp_connect require_git require_mods - run_script start_script key2sub xsys xqx eml_load tick); + run_script start_script key2sub xsys xqx eml_load tick + have_xapian_compact); sub eml_load ($) { my ($path, $cb) = @_; @@ -397,6 +398,12 @@ sub start_script { PublicInboxTestProcess->new($pid, $tail_pid); } +sub have_xapian_compact () { + require PublicInbox::Spawn; + # $ENV{XAPIAN_COMPACT} is used by PublicInbox/Xapcmd.pm, too + PublicInbox::Spawn::which($ENV{XAPIAN_COMPACT} || 'xapian-compact'); +} + package PublicInboxTestProcess; use strict; |