diff options
author | Eric Wong <e@80x24.org> | 2021-09-12 08:42:18 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-09-12 08:46:27 +0000 |
commit | fc7b32789a8d223e6550d9315216833fa602bd22 (patch) | |
tree | 4025f14e78b0b329dc80e14d4d4dd94b8e223f80 /lib/PublicInbox/TestCommon.pm | |
parent | a2455c390a80a95b0e36d42a6018a756e301519f (diff) | |
download | public-inbox-fc7b32789a8d223e6550d9315216833fa602bd22.tar.gz |
And try to improve the message about Inline::C while we're at it, since Socket::Msghdr isn't widely-packaged, yet.
Diffstat (limited to 'lib/PublicInbox/TestCommon.pm')
-rw-r--r-- | lib/PublicInbox/TestCommon.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 14dac03f..d28b32b0 100644 --- 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}; |