t/lei-*.t: guard setup_public_inboxes with test_lei

This ensures tests are skipped properly if SQLite or Xapian
are missing and don't bail out.

diff --git a/t/lei-auto-watch.t b/t/lei-auto-watch.t
index 3b0c1b109849a158d9d361eea55bdfbc77e66c08..e5e132eb3bfdfcf1879669cb854063e687d696aa 100644 (file)
--- a/t/lei-auto-watch.t
+++ b/t/lei-auto-watch.t
@@ -3,14 +3,13 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict; use v5.10.1; use PublicInbox::TestCommon;
 use File::Basename qw(basename);
-my ($ro_home, $cfg_path) = setup_public_inboxes;
 my $have_fast_inotify = eval { require Linux::Inotify2 } ||
        eval { require IO::KQueue };
-
 $have_fast_inotify or
        diag("$0 IO::KQueue or Linux::Inotify2 missing, test will be slow");
 
 test_lei(sub {
+       my ($ro_home, $cfg_path) = setup_public_inboxes;
        my $x = "$ENV{HOME}/x";
        my $y = "$ENV{HOME}/y";
        lei_ok qw(add-external), "$ro_home/t1";

diff --git a/t/lei-up.t b/t/lei-up.t
index c6f31c741c4c2275b62c5bd90f4799c3e9100741..6b34774d79da7f6158ff177308ed26078ee1d86c 100644 (file)
--- a/t/lei-up.t
+++ b/t/lei-up.t
@@ -2,9 +2,9 @@
 # Copyright all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict; use v5.10.1; use PublicInbox::TestCommon;
-my ($ro_home, $cfg_path) = setup_public_inboxes;
 use IO::Uncompress::Gunzip qw(gunzip $GunzipError);
 test_lei(sub {
+       my ($ro_home, $cfg_path) = setup_public_inboxes;
        my $s = eml_load('t/plack-qp.eml')->as_string;
        lei_ok [qw(import -q -F eml -)], undef, { 0 => \$s, %$lei_opt };
        lei_ok qw(q z:0.. -f mboxcl2 -o), "$ENV{HOME}/a.mbox.gz";