From a09f678d8254064af7ca6dcfb3c3f84b5ae37b51 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 22 Dec 2019 22:17:37 +0000 Subject: testcommon: add require_mods method and use it This cuts down on lines of code in individual test cases and fixes some misnamed error messages by using "$0" consistently. This will also provide us with a method of swapping out dependencies which provide equivalent functionality (e.g "Xapian" SWIG can replace "Search::Xapian" XS bindings). --- t/init.t | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 't/init.t') diff --git a/t/init.t b/t/init.t index f70d1c20..786add13 100644 --- a/t/init.t +++ b/t/init.t @@ -50,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"; -- cgit v1.2.3-24-ge0c7