diff options
| -rw-r--r-- | lib/PublicInbox/CodeSearchIdx.pm | 3 | ||||
| -rw-r--r-- | t/cindex.t | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm index f2fd28e3..80636270 100644 --- a/lib/PublicInbox/CodeSearchIdx.pm +++ b/lib/PublicInbox/CodeSearchIdx.pm @@ -858,7 +858,8 @@ sub prep_alternate_start { } my $cmd = [ 'git', "--git-dir=$git_dir", qw(config extensions.objectFormat) ]; - run_await($cmd, undef, undef, \&prep_alternate_end, $o, $run_prune); + my $opt = { quiet => 1 }; + run_await($cmd, undef, $opt, \&prep_alternate_end, $o, $run_prune); } sub cmd_done { # run_await cb for sort, xapian-delve, sed failures @@ -13,6 +13,7 @@ my ($tmp, $for_destroy) = tmpdir(); my $pwd = getcwd(); my @unused_keys = qw(last_commit has_threadid skip_docdata); local $ENV{PI_CONFIG} = '/dev/null'; +my $opt = { 1 => \(my $cidx_out), 2 => \(my $cidx_err) }; # I reworked CodeSearchIdx->shard_worker to handle empty trees # in the initial commit generated by cvs2svn for xapian.git @@ -166,7 +167,9 @@ SKIP: { # --prune is(scalar($csrch->mset('s:hi')->items), 1, 'got hit'); rename("$tmp/wt0/.git", "$tmp/wt0/.giit"); - ok(run_script([qw(-cindex -q --prune -d), "$tmp/ext"]), 'prune'); + ok(run_script([qw(-cindex -q --prune -d), "$tmp/ext"], undef, $opt), + 'prune'); + is(${$opt->{2}}, '', 'nothing in stderr') or diag explain($opt); $csrch->reopen; is(scalar($csrch->mset('s:hi')->items), 0, 'hit pruned'); @@ -213,7 +216,7 @@ EOM close $fh; my $cmd = [ qw(-cindex -u --all --associate -d), "$tmp/ext", '-I', $basic->{inboxdir} ]; - my $opt = { 1 => \(my $cidx_out), 2 => \(my $cidx_err) }; + $cidx_out = $cidx_err = ''; ok(run_script($cmd, $env, $opt), 'associate w/o search'); like($cidx_err, qr/W: \Q$basic->{inboxdir}\E not indexed for search/, 'non-Xapian-enabled inbox noted'); |