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, 13 insertions, 7 deletions

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 628beaf1..d8346673 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -18,7 +18,7 @@ BEGIN {
                 run_script start_script key2sub xsys xsys_e xqx eml_load tick
                 have_xapian_compact json_utf8 setup_public_inboxes create_inbox
                 tcp_host_port test_lei lei lei_ok $lei_out $lei_err $lei_opt
-                test_httpd xbail);
+                test_httpd xbail require_cmd);
         require Test::More;
         my @methods = grep(!/\W/, @Test::More::EXPORT);
         eval(join('', map { "*$_=\\&Test::More::$_;" } @methods));
@@ -87,6 +87,18 @@ sub tcp_connect {
         $s;
 }
 
+sub require_cmd ($;$) {
+        my ($cmd, $maybe) = @_;
+        require PublicInbox::Spawn;
+        my $bin = PublicInbox::Spawn::which($cmd);
+        return $bin if $bin;
+        $maybe ? 0 : plan(skip_all => "$cmd missing from PATH for $0");
+}
+
+sub have_xapian_compact () {
+        require_cmd($ENV{XAPIAN_COMPACT} || 'xapian-compact', 1);
+}
+
 sub require_git ($;$) {
         my ($req, $maybe) = @_;
         my ($req_maj, $req_min, $req_sub) = split(/\./, $req);
@@ -467,12 +479,6 @@ 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');
-}
-
 # favor lei() or lei_ok() over $lei for new code
 sub lei (@) {
         my ($cmd, $env, $xopt) = @_;