tests: account for missing git-http-backend

Alpine Linux ships git-http-backend in the `git-daemon'
package separately from `git', so we must test for its
existence before attempting to test functionality which
depends on it.

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index d587bf1054b9176a98efb15851618aae2351404b..27a758e4c3a310c663fc050ee62b350ae6a8a4ee 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -25,7 +25,7 @@ BEGIN {
                run_script start_script key2sub xsys xsys_e xqx eml_load tick
                have_xapian_compact json_utf8 setup_public_inboxes create_inbox
                create_coderepo require_bsd kernel_version check_broken_tmpfs
-               quit_waiter_pipe wait_for_eof
+               quit_waiter_pipe wait_for_eof require_git_http_backend
                tcp_host_port test_lei lei lei_ok $lei_out $lei_err $lei_opt
                test_httpd xbail require_cmd is_xdeeply tail_f
                ignore_inline_c_missing no_pollerfd no_coredump cfg_new
@@ -163,6 +163,23 @@ sub require_git ($;$) {
                skip("git $req+ required (have $cur_ver), skipping $nr tests")
 }
 
+sub require_git_http_backend (;$) {
+       my ($nr) = @_;
+       state $ok = do {
+               require PublicInbox::Git;
+               my $git = PublicInbox::Git::check_git_exe() or plan
+                       skip_all => 'nothing in public-inbox works w/o git';
+               my $rdr = { 1 => \my $out, 2 => \my $err };
+               xsys([$git, qw(http-backend)], undef, $rdr);
+               $out =~ /^Status:/ism;
+       };
+       if (!$ok) {
+               my $msg = "`git http-backend' not available";
+               defined($nr) ? skip $msg, $nr : plan skip_all => $msg;
+       }
+       $ok;
+}
+
 my %IPv6_VERSION = (
        'Net::NNTP' => 3.00,
        'Mail::IMAPClient' => 3.40,

diff --git a/t/clone-coderepo.t b/t/clone-coderepo.t
index 0e6b4ac73ad9bf01072a32cc4f5e52aa8dad0827..c0951941d4c8c56866049ee513901c2d7b62d6e3 100644 (file)
--- a/t/clone-coderepo.t
+++ b/t/clone-coderepo.t
@@ -8,6 +8,7 @@ use File::Temp;
 use File::Path qw(remove_tree);
 use PublicInbox::SHA qw(sha1_hex);
 require_mods(qw(json Plack::Builder HTTP::Date HTTP::Status));
+require_git_http_backend;
 require_git '1.8.5';
 require_cmd 'curl';
 require_ok 'PublicInbox::LeiMirror';

diff --git a/t/httpd.t b/t/httpd.t
index 0421c7eac720ccd448df64828469cd92a8739a7c..c0fbaa22be3e2bd8595e9aa44b7ed1b3b71795ea 100644 (file)
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -7,6 +7,7 @@ use PublicInbox::TestCommon;
 use PublicInbox::Eml;
 use Socket qw(IPPROTO_TCP SOL_SOCKET);
 require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
+require_git_http_backend;
 
 # FIXME: too much setup
 my ($tmpdir, $for_destroy) = tmpdir();

diff --git a/t/lei-mirror.t b/t/lei-mirror.t
index 37c9751ba2a3736daad13f73357d83920809b672..76041b7358c76d64bd4c27f37bb3b21d5f4a044f 100644 (file)
--- a/t/lei-mirror.t
+++ b/t/lei-mirror.t
@@ -5,6 +5,7 @@ use v5.12; use PublicInbox::TestCommon;
 use PublicInbox::Inbox;
 require_mods(qw(-httpd lei DBD::SQLite));
 require_cmd('curl');
+require_git_http_backend;
 use PublicInbox::Spawn qw(which);
 require PublicInbox::Msgmap;
 my $sock = tcp_server();

diff --git a/t/www_listing.t b/t/www_listing.t
index 709dbd059a41933ad093f86d3ebc35c91b4e4e51..0a4c79e8f58acfbaf009de3c4e7015dc2a36ece1 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -77,6 +77,7 @@ sub tiny_test {
 
 my $td;
 SKIP: {
+       require_git_http_backend 1;
        my $err = "$tmpdir/stderr.log";
        my $out = "$tmpdir/stdout.log";
        my $alt = "$tmpdir/alt.git";