treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / t / init.t

diff --git a/t/init.t b/t/init.t
index 2442eeec7fbcb43a5ee9767230da9c4081848126..e20ff006126bb27d2730d2ed4a7667e3e2bb325e 100644 (file)
--- a/t/init.t
+++ b/t/init.t
@@ -1,13 +1,12 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 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 PublicInbox::Config;
-use File::Temp qw/tempdir/;
-require './t/common.perl';
-my $tmpdir = tempdir('pi-init-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::TestCommon;
 use File::Basename;
+my ($tmpdir, $for_destroy) = tmpdir();
 sub quiet_fail {
        my ($cmd, $msg) = @_;
        my $err = '';
@@ -51,10 +50,7 @@ sub quiet_fail {
 }
 
 SKIP: {
-       foreach my $mod (qw(DBD::SQLite Search::Xapian::WritableDatabase)) {
-               eval "require $mod";
-               skip "$mod missing for v2", 2 if $@;
-       }
+       require_mods(qw(DBD::SQLite Search::Xapian::WritableDatabase), 2);
        require_git(2.6, 1) or skip "git 2.6+ required", 2;
        local $ENV{PI_DIR} = "$tmpdir/.public-inbox/";
        my $cfgfile = "$ENV{PI_DIR}/config";