tests: add require_cmd, require curl when needed

t/v2mirror.t and t/lei-mirror.t are now skipped when curl
is missing (instead of failing in appropriate places).
A bunch of which() checks are updated to use require_cmd
to avoid explicitly loading Spawn.

1 files changed, 2 insertions, 7 deletions

diff --git a/t/hl_mod.t b/t/hl_mod.t
index ffe9e784..96878d51 100644
--- a/t/hl_mod.t
+++ b/t/hl_mod.t
@@ -1,12 +1,7 @@
 #!/usr/bin/perl -w
 # Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
-use strict;
-use warnings;
-use Test::More;
-use PublicInbox::Spawn qw(which);
-use PublicInbox::TestCommon;
-use IO::Handle; # ->autoflush
+use strict; use v5.10.1; use PublicInbox::TestCommon; use IO::Handle; # ->autoflush
 use Fcntl qw(:seek);
 eval { require highlight } or
         plan skip_all => "failed to load highlight.pm for $0";
@@ -30,7 +25,7 @@ my $orig = $str;
         is($$ref, $$lref, 'do_hl_lang matches do_hl');
 
         SKIP: {
-                my $w3m = which('w3m') or
+                my $w3m = require_cmd('w3m', 1) or
                         skip('w3m(1) missing to check output', 1);
                 my $cmd = [ $w3m, qw(-T text/html -dump -config /dev/null) ];
                 my $in = '<pre>' . $$ref . '</pre>';