lei sucks: allow it to work without SQLite

And try to improve the message about Inline::C while we're at
it, since Socket::Msghdr isn't widely-packaged, yet.

diff --git a/lib/PublicInbox/LeiSucks.pm b/lib/PublicInbox/LeiSucks.pm
index 3e945d0b204dc53d7119947d31b09b479a95cf4e..e832f95e07367d28bfcea8e6a0c5b77d026b71ba 100644 (file)
--- a/lib/PublicInbox/LeiSucks.pm
+++ b/lib/PublicInbox/LeiSucks.pm
@@ -11,7 +11,6 @@ use Digest::SHA ();
 use Config;
 use POSIX ();
 use PublicInbox::Config;
-use PublicInbox::Search;
 
 sub lei_sucks {
        my ($lei, @argv) = @_;
@@ -41,7 +40,8 @@ sub lei_sucks {
        } else {
                push @out, "Unable to load DBI / DBD::SQLite: $@\n";
        }
-       if (PublicInbox::Search::load_xapian()) {
+       if (eval { require PublicInbox::Search } &&
+                       PublicInbox::Search::load_xapian()) {
                push @out, 'Xapian '.
                        join('.', map {
                                $PublicInbox::Search::Xap->can($_)->();

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 14dac03fae54ed78cffb417c59af59005ffaf93d..d28b32b07571f5ac28778d2dcd60fa36266c50f6 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -521,7 +521,8 @@ SKIP: {
        local $lei_cwdfh;
        opendir $lei_cwdfh, '.' or xbail "opendir .: $!";
        require_git(2.6, 1) or skip('git 2.6+ required for lei test', 2);
-       require_mods(qw(json DBD::SQLite Search::Xapian), 2);
+       my $mods = $test_opt->{mods} // [ 'lei' ];
+       require_mods(@$mods, 2);
        require PublicInbox::Config;
        require File::Path;
        local %ENV = %ENV;
@@ -534,10 +535,11 @@ SKIP: {
        require PublicInbox::Spawn;
        state $lei_daemon = PublicInbox::Spawn->can('send_cmd4') ||
                                eval { require Socket::MsgHdr; 1 };
-       # XXX fix and move this inside daemon-only before 1.7 release
-       skip <<'EOM', 1 unless $lei_daemon;
-Socket::MsgHdr missing or Inline::C is unconfigured/missing
-EOM
+       unless ($lei_daemon) {
+               skip('Inline::C unconfigured/missing '.
+'(mkdir -p ~/.cache/public-inbox/inline-c) OR Socket::MsgHdr missing',
+                       1);
+       }
        $lei_opt = { 1 => \$lei_out, 2 => \$lei_err };
        my ($daemon_pid, $for_destroy, $daemon_xrd);
        my $tmpdir = $test_opt->{tmpdir};

diff --git a/t/lei.t b/t/lei.t
index dfbcb1f303ba99256ceda438184c993fc701601f..d1f1cbc018290cdbee765f52f84b9d0a2d81bb82 100644 (file)
--- a/t/lei.t
+++ b/t/lei.t
@@ -176,4 +176,8 @@ test_lei(sub {
        $test_fail->();
 });
 
+test_lei({ mods => [] }, sub {
+       lei_ok('sucks', \'no optional modules required');
+});
+
 done_testing;