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.
t/hval.t
t/import.t
t/inbox.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
t/indexlevels-mirror.t
t/init.t
t/linkify.t
use Test::More;
use_ok 'PublicInbox::DS';
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;
use PublicInbox::Spawn qw(spawn);
my $pid;
my $evfd_re = qr/(?:kqueue|eventpoll)/i;
waitpid($pid, 0);
}
PublicInbox::DS->Reset;
waitpid($pid, 0);
}
PublicInbox::DS->Reset;
SKIP: {
# not bothering with BSD::Resource
SKIP: {
# not bothering with BSD::Resource
--- /dev/null
+# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+$ENV{PI_TEST_VERSION} = 1;
+require './t/indexlevels-mirror.t';
use File::Temp qw/tempdir/;
require PublicInbox::Admin;
require './t/common.perl';
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";
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';
}
my $path = 'blib/script';
sub import_index_incremental {
my ($v, $level) = @_;
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",
my $ibx = PublicInbox::Inbox->new({
mainrepo => "$tmpdir/testbox",
version => $v,
-primary_address => 'test@example.com',
indexlevel => $level,
version => $v,
-primary_address => 'test@example.com',
indexlevel => $level,
'indexlevel detectable by Admin '.$v.$level);
}
'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;
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);
require './t/common.perl';
# FIXME: make easier to test both versions
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);
require_git('2.6') if $version == 2;
my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);