From 99566f264b4a13f5e9096411f1c87c4def153ab1 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 22 May 2019 02:13:59 +0000 Subject: t/watch_filter_rubylang: disable v2 test for git < 2.6 This test was not disabled properly for ancient versions of git without get-mark support. --- t/watch_filter_rubylang.t | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/watch_filter_rubylang.t b/t/watch_filter_rubylang.t index 32565556..da383c15 100644 --- a/t/watch_filter_rubylang.t +++ b/t/watch_filter_rubylang.t @@ -2,6 +2,7 @@ # License: AGPL-3.0+ use strict; use warnings; +require './t/common.perl'; use Test::More; use File::Temp qw/tempdir/; use PublicInbox::MIME; @@ -12,13 +13,22 @@ foreach my $mod (@mods) { plan skip_all => "$mod missing for watch_filter_rubylang_v2.t" if $@; } -use_ok 'PublicInbox::V2Writable'; use_ok 'PublicInbox::WatchMaildir'; use_ok 'PublicInbox::Emergency'; my $tmpdir = tempdir('watch-XXXXXX', TMPDIR => 1, CLEANUP => 1); local $ENV{PI_CONFIG} = "$tmpdir/pi_config"; -for my $v (qw(V1 V2)) { +my @v = qw(V1); +SKIP: { + if (require_git(2.6, 1)) { + use_ok 'PublicInbox::V2Writable'; + push @v, 'V2'; + } else { + skip 'git 2.6+ needed for V2', 40; + } +} + +for my $v (@v) { my @warn; $SIG{__WARN__} = sub { push @warn, @_ }; my $cfgpfx = "publicinbox.$v"; -- cgit v1.2.3-24-ge0c7