X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2reindex.t;h=cafe8648d1e8b0dd1275f6af884585402e5aee70;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=e9f2b73b2b9083060359a45300c2fc286f173853;hpb=59bb5f9287d5cd8009d8aae2d07fbf47d1b6bd91;p=public-inbox.git

diff --git a/t/v2reindex.t b/t/v2reindex.t
index e9f2b73b..cafe8648 100644
--- a/t/v2reindex.t
+++ b/t/v2reindex.t
@@ -1,12 +1,9 @@
 # Copyright (C) 2018-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
-use strict;
-use warnings;
-use Test::More;
+use strict; use v5.10.1; use PublicInbox::TestCommon;
 use PublicInbox::Eml;
 use PublicInbox::ContentHash qw(content_digest);
 use File::Path qw(remove_tree);
-use PublicInbox::TestCommon;
 require_git(2.6);
 require_mods(qw(DBD::SQLite Search::Xapian));
 use_ok 'PublicInbox::V2Writable';
@@ -551,9 +548,8 @@ ok(run_script([qw(-index --reindex --xapian-only), $inboxdir], $env, $rdr),
 is($err, '', 'no errors from --xapian-only');
 undef $for_destroy;
 SKIP: {
-	use PublicInbox::Spawn qw(which);
 	skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux';
-	my $lsof = which('lsof') or skip 'no lsof in PATH', 1;
+	my $lsof = require_cmd('lsof', 1) or skip 'no lsof in PATH', 1;
 	my $rdr = { 2 => \(my $null_err) };
 	my @d = grep(m!/xap[0-9]+/!, xqx([$lsof, '-p', $$], undef, $rdr));
 	is_deeply(\@d, [], 'no deleted index files') or diag explain(\@d);