X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=xt%2Fimapd-mbsync-oimap.t;h=b02811055e5336a8e4124c08f636a8a15aeaf639;hb=5dbb060037ce3e3a3ba0812baa90c80eeee762af;hp=6635e2b477ee80381dd64118f5bb5bd1f4f5757b;hpb=860169adcd29341142b7c4a369c09b4ac492bd1e;p=public-inbox.git

diff --git a/xt/imapd-mbsync-oimap.t b/xt/imapd-mbsync-oimap.t
index 6635e2b4..b0281105 100644
--- a/xt/imapd-mbsync-oimap.t
+++ b/xt/imapd-mbsync-oimap.t
@@ -1,13 +1,13 @@
 #!perl -w
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # ensure mbsync and offlineimap compatibility
 use strict;
-use Test::More;
+use v5.10.1;
 use File::Path qw(mkpath);
 use PublicInbox::TestCommon;
-use PublicInbox::Spawn qw(which spawn);
-require_mods(qw(DBD::SQLite Email::Address::XS||Mail::Address));
+use PublicInbox::Spawn qw(spawn);
+require_mods(qw(-imapd));
 my $inboxdir = $ENV{GIANT_INBOX_DIR};
 (defined($inboxdir) && -d $inboxdir) or
 	plan skip_all => "GIANT_INBOX_DIR not defined for $0";
@@ -42,7 +42,8 @@ my %pids;
 
 SKIP: {
 	mkpath([map { "$tmpdir/oimapdir/$_" } qw(cur new tmp)]);
-	my $oimap = which('offlineimap') or skip 'no offlineimap(1)', 1;
+	my $oimap = require_cmd('offlineimap', 1) or
+		skip 'no offlineimap(1)', 1;
 	open my $fh, '>', "$tmpdir/.offlineimaprc" or BAIL_OUT "open: $!";
 	print $fh <<EOF or BAIL_OUT "print: $!";
 [general]
@@ -78,7 +79,7 @@ EOF
 
 SKIP: {
 	mkpath([map { "$tmpdir/mbsyncdir/test/$_" } qw(cur new tmp)]);
-	my $mbsync = which('mbsync') or skip 'no mbsync(1)', 1;
+	my $mbsync = require_cmd('mbsync', 1) or skip 'no mbsync(1)', 1;
 	open my $fh, '>', "$tmpdir/.mbsyncrc" or BAIL_OUT "open: $!";
 	print $fh <<EOF or BAIL_OUT "print: $!";
 Create Slave