From: Eric Wong <e@80x24.org>
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 [thread overview]
Message-ID: <20190522021402.24114-3-e@80x24.org> (raw)
In-Reply-To: <20190522021402.24114-1-e@80x24.org>
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+ <https://www.gnu.org/licenses/agpl-3.0.txt>
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
next prev parent reply other threads:[~2019-05-22 2:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 2:13 [PATCH 0/5] fixes for CentOS 7 Eric Wong
2019-05-22 2:13 ` [PATCH 1/5] init: preserve permissions for git prior to 2.1.0 Eric Wong
2019-05-22 2:13 ` Eric Wong [this message]
2019-05-22 2:14 ` [PATCH 3/5] git: workaround old git-rev-parse(1) (--git-path) Eric Wong
2019-05-22 2:14 ` [PATCH 4/5] t/search*: require DBI and DBD::SQLite, too Eric Wong
2019-05-22 2:14 ` [PATCH 5/5] ci: support CentOS-7 Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190522021402.24114-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).