www: drop --subject from "git send-email" instructions

[public-inbox.git] / t / lei-externals.t

diff --git a/t/lei-externals.t b/t/lei-externals.t
index 5e3c67bc638ed80ef6f9ff72cf82cc0354d24332..284be1b9866b838a904fedc2576738e7ce9eb5b4 100644 (file)
--- a/t/lei-externals.t
+++ b/t/lei-externals.t
@@ -3,7 +3,6 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict; use v5.10.1; use PublicInbox::TestCommon;
 use Fcntl qw(SEEK_SET);
-use PublicInbox::Spawn qw(which);
 require_git 2.6;
 require_mods(qw(json DBD::SQLite Search::Xapian));
 use POSIX qw(WTERMSIG WIFSIGNALED SIGPIPE);
@@ -17,9 +16,10 @@ my $test_external_remote = sub {
        my ($url, $k) = @_;
 SKIP: {
        skip "$k unset", 1 if !$url;
-       state $curl = which('curl');
-       $curl or skip 'no curl', 1;
-       which('torsocks') or skip 'no torsocks', 1 if $url =~ m!\.onion/!;
+       require_cmd 'curl', 1 or skip 'curl missing', 1;
+       if ($url =~ m!\.onion/!) {
+               require_cmd 'torsocks', 1 or skip 'no torsocks', 1;
+       }
        my $mid = '20140421094015.GA8962@dcvr.yhbt.net';
        my @cmd = ('q', '--only', $url, '-q', "m:$mid");
        lei_ok(@cmd, \"query $url");
@@ -76,6 +76,7 @@ test_lei(sub {
        my $config_file = "$home/.config/lei/config";
        my $store_dir = "$home/.local/share/lei";
        lei_ok 'ls-external', \'ls-external on fresh install';
+       ignore_inline_c_missing($lei_err);
        is($lei_out.$lei_err, '', 'ls-external no output, yet');
        ok(!-e $config_file && !-e $store_dir,
                'nothing created by ls-external');