ensure Xapian and SQLite are still optional for v1 tests

Xapian is size-intensive and SQLite is not strictly necessary for v1.

diff --git a/script/public-inbox-compact b/script/public-inbox-compact
index 43e94609a01ee79891cf11c25363e263492d06c5..d855b9e1bda469dedc05719946a3fc224c06217f 100755 (executable)
--- a/script/public-inbox-compact
+++ b/script/public-inbox-compact
@@ -4,9 +4,9 @@
 use strict;
 use warnings;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-use PublicInbox::V2Writable;
 use PublicInbox::Search;
 use PublicInbox::Config;
+use PublicInbox::InboxWritable;
 use Cwd 'abs_path';
 use File::Temp qw(tempdir);
 use File::Path qw(remove_tree);

diff --git a/scripts/import_vger_from_mbox b/scripts/import_vger_from_mbox
index 191f75d67ebff99e8f1d88f05ea70a54e87a9828..ca5a408da2c1b9318d46645cb034ffba299f09ec 100644 (file)
--- a/scripts/import_vger_from_mbox
+++ b/scripts/import_vger_from_mbox
@@ -6,7 +6,6 @@ use warnings;
 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
 use PublicInbox::MIME;
 use PublicInbox::InboxWritable;
-use PublicInbox::V2Writable;
 use PublicInbox::Import;
 use PublicInbox::MDA;
 my $usage = "usage: $0 NAME EMAIL DIR <MBOX\n";
@@ -35,6 +34,7 @@ my $ibx = {
 $ibx = PublicInbox::Inbox->new($ibx);
 unless ($dry_run) {
        if ($version >= 2) {
+               require PublicInbox::V2Writable;
                PublicInbox::V2Writable->new($ibx, 1)->init_inbox(0);
        } else {
                system(qw(git init --bare -q), $mainrepo) == 0 or die;

diff --git a/t/convert-compact.t b/t/convert-compact.t
index e2ba40a5892adc19e2839b15781f170a5037c62b..5caa0acc36c171d80da0e15dedec8893b19f6854 100644 (file)
--- a/t/convert-compact.t
+++ b/t/convert-compact.t
@@ -10,7 +10,7 @@ foreach my $mod (@mods) {
        eval "require $mod";
        plan skip_all => "$mod missing for convert-compact.t" if $@;
 }
-use PublicInbox::V2Writable;
+use_ok 'PublicInbox::V2Writable';
 use PublicInbox::Import;
 my $tmpdir = tempdir('convert-compact-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $ibx = {

diff --git a/t/v2mirror.t b/t/v2mirror.t
index 0c66aef48d1d9473874e10e265cd662e049af3a3..9e0c9e1d17c0b58df9f6db69bd05b92736f928d4 100644 (file)
--- a/t/v2mirror.t
+++ b/t/v2mirror.t
@@ -13,7 +13,7 @@ foreach my $mod (qw(Plack::Util Plack::Builder Danga::Socket
 use File::Temp qw/tempdir/;
 use IO::Socket;
 use POSIX qw(dup2);
-use PublicInbox::V2Writable;
+use_ok 'PublicInbox::V2Writable';
 use PublicInbox::MIME;
 use PublicInbox::Config;
 use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD);