From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id A22DE20382 for ; Wed, 22 May 2019 02:14:03 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/5] t/watch_filter_rubylang: disable v2 test for git < 2.6 Date: Wed, 22 May 2019 02:13:59 +0000 Message-Id: <20190522021402.24114-3-e@80x24.org> In-Reply-To: <20190522021402.24114-1-e@80x24.org> References: <20190522021402.24114-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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(-) diff --git a/t/watch_filter_rubylang.t b/t/watch_filter_rubylang.t index 3256555..da383c1 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"; -- EW