[PATCH 2/2] tests: allow more tests to pass without xapian-compact

[Eric Wong <e@80x24.org>]

---
 lib/PublicInbox/TestCommon.pm | 3 ++-
 t/extsearch.t                 | 2 +-
 t/nntpd.t                     | 4 ++--
 t/xcpdb-reshard.t             | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index b1a37ced..a8323e4d 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -105,7 +105,8 @@ sub require_cmd ($;$) {
 	my $bin = $CACHE{$cmd} //= PublicInbox::Spawn::which($cmd);
 	return $bin if $bin;
 	return plan(skip_all => "$cmd missing from PATH for $0") if !$nr;
-	defined(wantarray) ? undef : skip("$cmd missing, skipping $nr tests")
+	defined(wantarray) ? undef :
+		skip("$cmd missing, skipping $nr tests", $nr);
 }
 
 sub have_xapian_compact (;$) {
diff --git a/t/extsearch.t b/t/extsearch.t
index 545330aa..8ded3382 100644
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -480,7 +480,7 @@ SKIP: {
 	for my $i (2..3) {
 		is(grep(m!/ei[0-9]+/$i\z!, @dirs), 0, "no shard [$i]");
 	}
-	skip 'xapian-compact missing', 4 unless have_xapian_compact;
+	have_xapian_compact 1;
 	ok(run_script([qw(-compact), $d], undef, $o), 'compact');
 	# n.b. stderr contains xapian-compact output
 
diff --git a/t/nntpd.t b/t/nntpd.t
index f98d638e..9a7efd86 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -341,8 +341,8 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
 	}
 	# -compact requires Xapian
 	SKIP: {
-		require_mods('Xapian', 2);
-		have_xapian_compact or skip 'xapian-compact missing', 2;
+		require_mods('Xapian', 1);
+		have_xapian_compact 1;
 		is(xsys(qw(git config), "--file=$home/.public-inbox/config",
 				"publicinbox.$group.indexlevel", 'medium'),
 			0, 'upgraded indexlevel');
diff --git a/t/xcpdb-reshard.t b/t/xcpdb-reshard.t
index cde9f151..7797aaaf 100644
--- a/t/xcpdb-reshard.t
+++ b/t/xcpdb-reshard.t
@@ -43,7 +43,7 @@ my $XapianDatabase = do {
 for my $R (qw(2 4 1 3 3)) {
 	delete $ibx->{search}; # release old handles
 	my $cmd = [@xcpdb, "-R$R", $ibx->{inboxdir}];
-	push @$cmd, '--compact' if $R == 1 && have_xapian_compact;
+	push @$cmd, '--compact' if $R == 1 && have_xapian_compact(1);
 	ok(run_script($cmd, $env), "xcpdb -R$R");
 	my @new_shards = grep(m!/\d+\z!, glob("$ibx->{inboxdir}/xap*/*"));
 	is(scalar(@new_shards), $R, 'resharded to two shards');