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,AWL,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 23FCE1F462 for ; Tue, 4 Jun 2019 11:36:39 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] t: avoid "subtest" for Perl 5.10.1 compatibility Date: Tue, 4 Jun 2019 11:36:39 +0000 Message-Id: <20190604113639.5413-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: The version of Test::More from Perl 5.10.1 did not support "subtest", and the earliest version which did is Perl 5.12.0 The good news is this gives me an excuse to parallelize the indexlevels-mirror test by splitting it into two. (it could be further split, even). Update t/nntpd. to use PI_TEST_VERSION consistently while we're at it. --- MANIFEST | 1 + t/ds-leak.t | 4 ++-- t/indexlevels-mirror-v1.t | 4 ++++ t/indexlevels-mirror.t | 29 ++++++++++------------------- t/nntpd.t | 2 +- 5 files changed, 18 insertions(+), 22 deletions(-) create mode 100644 t/indexlevels-mirror-v1.t diff --git a/MANIFEST b/MANIFEST index 8a3f2a4..251f95f 100644 --- a/MANIFEST +++ b/MANIFEST @@ -204,6 +204,7 @@ t/httpd.t t/hval.t t/import.t t/inbox.t +t/indexlevels-mirror-v1.t t/indexlevels-mirror.t t/init.t t/linkify.t diff --git a/t/ds-leak.t b/t/ds-leak.t index 9e3243e..dd8446d 100644 --- a/t/ds-leak.t +++ b/t/ds-leak.t @@ -8,7 +8,7 @@ use warnings; use Test::More; use_ok 'PublicInbox::DS'; -subtest('close-on-exec for epoll and kqueue' => sub { +if ('close-on-exec for epoll and kqueue') { use PublicInbox::Spawn qw(spawn); my $pid; my $evfd_re = qr/(?:kqueue|eventpoll)/i; @@ -29,7 +29,7 @@ subtest('close-on-exec for epoll and kqueue' => sub { waitpid($pid, 0); } PublicInbox::DS->Reset; -}); +} SKIP: { # not bothering with BSD::Resource diff --git a/t/indexlevels-mirror-v1.t b/t/indexlevels-mirror-v1.t new file mode 100644 index 0000000..9998a09 --- /dev/null +++ b/t/indexlevels-mirror-v1.t @@ -0,0 +1,4 @@ +# Copyright (C) 2019 all contributors +# License: AGPL-3.0+ +$ENV{PI_TEST_VERSION} = 1; +require './t/indexlevels-mirror.t'; diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t index bf0f801..3597494 100644 --- a/t/indexlevels-mirror.t +++ b/t/indexlevels-mirror.t @@ -9,12 +9,12 @@ use PublicInbox::InboxWritable; use File::Temp qw/tempdir/; require PublicInbox::Admin; require './t/common.perl'; -require_git(2.6); -my $this = (split('/', __FILE__))[-1]; +my $PI_TEST_VERSION = $ENV{PI_TEST_VERSION} || 2; +require_git('2.6') if $PI_TEST_VERSION == 2; foreach my $mod (qw(DBD::SQLite)) { eval "require $mod"; - plan skip_all => "$mod missing for $this" if $@; + plan skip_all => "$mod missing for $0" if $@; } my $path = 'blib/script'; @@ -33,10 +33,11 @@ my $mime = PublicInbox::MIME->create( sub import_index_incremental { my ($v, $level) = @_; - my $tmpdir = tempdir("pi-$this-tmp-XXXXXX", TMPDIR => 1, CLEANUP => 1); + my $this = "pi-$v-$level-indexlevels"; + my $tmpdir = tempdir("$this-tmp-XXXXXX", TMPDIR => 1, CLEANUP => 1); my $ibx = PublicInbox::Inbox->new({ mainrepo => "$tmpdir/testbox", - name => "$this-$v", + name => $this, version => $v, -primary_address => 'test@example.com', indexlevel => $level, @@ -165,24 +166,14 @@ sub import_index_incremental { 'indexlevel detectable by Admin '.$v.$level); } -# we can probably cull some other tests and put full/medium tests, here -for my $level (qw(basic)) { - for my $v (1..2) { - subtest("v$v indexlevel=$level" => sub { - import_index_incremental($v, $level); - }) - } -} +# we can probably cull some other tests +import_index_incremental($PI_TEST_VERSION, 'basic'); SKIP: { require PublicInbox::Search; PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 2; - for my $v (1..2) { - foreach my $l (qw(medium full)) { - subtest("v$v indexlevel=$l" => sub { - import_index_incremental($v, $l); - }); - } + foreach my $l (qw(medium full)) { + import_index_incremental($PI_TEST_VERSION, $l); } } diff --git a/t/nntpd.t b/t/nntpd.t index aa62ff6..c73cc12 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -19,7 +19,7 @@ use Sys::Hostname; require './t/common.perl'; # FIXME: make easier to test both versions -my $version = $ENV{PI_VERSION} || 2; +my $version = $ENV{PI_TEST_VERSION} || 2; require_git('2.6') if $version == 2; my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1); -- EW