From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 1ACCE1F517 for ; Fri, 6 Apr 2018 21:44:40 +0000 (UTC) From: "Eric Wong (Contractor, The Linux Foundation)" To: meta@public-inbox.org Subject: [PATCH 4/4] ensure Xapian and SQLite are still optional for v1 tests Date: Fri, 6 Apr 2018 21:44:39 +0000 Message-Id: <20180406214439.29591-5-e@80x24.org> In-Reply-To: <20180406214439.29591-1-e@80x24.org> References: <20180406214439.29591-1-e@80x24.org> List-Id: Xapian is size-intensive and SQLite is not strictly necessary for v1. --- script/public-inbox-compact | 2 +- scripts/import_vger_from_mbox | 2 +- t/convert-compact.t | 2 +- t/v2mirror.t | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script/public-inbox-compact b/script/public-inbox-compact index 43e9460..d855b9e 100755 --- 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 191f75d..ca5a408 100644 --- 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 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 e2ba40a..5caa0ac 100644 --- 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 0c66aef..9e0c9e1 100644 --- 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); -- EW