t/www_listing: require opt-in for grokmirror tests

grokmirror 2.x seems to idle in several places for 5s at-a-time,
causing t/www_listing.t to take longer than "make check-run" on
a 4-core system when run without grokmirror.  So make it
optional but add some test knobs to allow tailing the log
output so I can see what's going on.

diff --git a/t/www_listing.t b/t/www_listing.t
index eb77969b5039e0b222f029386051e02643bf560a..c556a2d72aeb1c8d887c93103e2828141949e872 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -130,27 +130,31 @@ SKIP: {
        tiny_test($json, $host, $port, 1);
        undef $sock;
 
+       skip 'TEST_GROK unset', 12 unless $ENV{TEST_GROK};
        my $grok_pull = require_cmd('grok-pull', 1) or
                skip('grok-pull not available', 12);
        my ($grok_version) = (xqx([$grok_pull, "--version"])
                        =~ /(\d+)\.(?:\d+)(?:\.(\d+))?/);
        $grok_version >= 2 or
                skip('grok-pull v2 or later not available', 12);
+       my $grok_loglevel = $ENV{TEST_GROK_LOGLEVEL} // 'info';
 
        ok(mkdir("$tmpdir/mirror"), 'prepare grok mirror dest');
-       open $fh, '>', "$tmpdir/repos.conf" or die;
-       print $fh <<"" or die;
+       my $tail = tail_f("$tmpdir/grok.log");
+       open $fh, '>', "$tmpdir/repos.conf" or xbail $!;
+       print $fh <<"" or xbail $!;
 [core]
 toplevel = $tmpdir/mirror
 manifest = $tmpdir/local-manifest.js.gz
+log = $tmpdir/grok.log
+loglevel = $grok_loglevel
 [remote]
 site = http://$host:$port
 manifest = \${site}/manifest.js.gz
 [pull]
 [fsck]
 
-       close $fh or die;
-
+       close $fh or xbail $!;
        xsys($grok_pull, '-c', "$tmpdir/repos.conf");
        is($? >> 8, 0, 'grok-pull exit code as expected');
        for (qw(alt bare v2/git/0.git v2/git/1.git v2/git/2.git)) {
@@ -159,18 +163,20 @@ manifest = \${site}/manifest.js.gz
 
        # support per-inbox manifests, handy for v2:
        # /$INBOX/v2/manifest.js.gz
-       open $fh, '>', "$tmpdir/per-inbox.conf" or die;
-       print $fh <<"" or die;
+       open $fh, '>', "$tmpdir/per-inbox.conf" or xbail $!;
+       print $fh <<"" or xbail $!;
 [core]
 toplevel = $tmpdir/per-inbox
 manifest = $tmpdir/per-inbox-manifest.js.gz
+log = $tmpdir/grok.log
+loglevel = $grok_loglevel
 [remote]
 site = http://$host:$port
 manifest = \${site}/v2/manifest.js.gz
 [pull]
 [fsck]
 
-       close $fh or die;
+       close $fh or xbail $!;
        ok(mkdir("$tmpdir/per-inbox"), 'prepare single-v2-inbox mirror');
        xsys($grok_pull, '-c', "$tmpdir/per-inbox.conf");
        is($? >> 8, 0, 'grok-pull exit code as expected');