Skip to content

Commit 24f889c

Browse files
committed
Some portability fixes for Test2::Suite tests
Also sent upstream: Test-More/Test2-Suite#296
1 parent 42365d0 commit 24f889c

File tree

7 files changed

+24
-14
lines changed

7 files changed

+24
-14
lines changed

Porting/Maintainers.pl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,6 +1144,14 @@ package Maintainers;
11441144
# https://github.com/Test-More/Test2-Suite/issues/208
11451145
't/acceptance/Workflow-Acceptance.t',
11461146
],
1147+
'CUSTOMIZED' => [
1148+
# https://github.com/Test-More/Test2-Suite/pull/296
1149+
't/modules/Require/AutomatedTesting.t',
1150+
't/modules/Require/ExtendedTesting.t',
1151+
't/modules/Require/NonInteractiveTesting.t',
1152+
't/modules/Require/ReleaseTesting.t',
1153+
't/regression/291-async-subtest-done-testing.t',
1154+
],
11471155
},
11481156

11491157
'Text::Abbrev' => {

cpan/Test2-Suite/t/modules/Require/AutomatedTesting.t

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use Test2::Bundle::Extended -target => 'Test2::Require::AutomatedTesting';
22

33
{
4-
local %ENV = %ENV;
5-
$ENV{AUTOMATED_TESTING} = 0;
4+
local $ENV{AUTOMATED_TESTING} = 0;
65
is($CLASS->skip(), 'Automated test, set the $AUTOMATED_TESTING environment variable to run it', "will skip");
76

87
$ENV{AUTOMATED_TESTING} = 1;

cpan/Test2-Suite/t/modules/Require/ExtendedTesting.t

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use Test2::Bundle::Extended -target => 'Test2::Require::ExtendedTesting';
22

33
{
4-
local %ENV = %ENV;
5-
$ENV{EXTENDED_TESTING} = 0;
4+
local $ENV{EXTENDED_TESTING} = 0;
65
is($CLASS->skip(), 'Extended test, set the $EXTENDED_TESTING environment variable to run it', "will skip");
76

87
$ENV{EXTENDED_TESTING} = 1;

cpan/Test2-Suite/t/modules/Require/NonInteractiveTesting.t

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use Test2::Bundle::Extended -target => 'Test2::Require::NonInteractiveTesting';
22

33
{
4-
local %ENV = %ENV;
5-
$ENV{NONINTERACTIVE_TESTING} = 0;
4+
local $ENV{NONINTERACTIVE_TESTING} = 0;
65
is($CLASS->skip(), 'NonInteractive test, set the $NONINTERACTIVE_TESTING environment variable to run it', "will skip");
76

87
$ENV{NONINTERACTIVE_TESTING} = 1;

cpan/Test2-Suite/t/modules/Require/ReleaseTesting.t

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use Test2::Bundle::Extended -target => 'Test2::Require::ReleaseTesting';
22

33
{
4-
local %ENV = %ENV;
5-
$ENV{RELEASE_TESTING} = 0;
4+
local $ENV{RELEASE_TESTING} = 0;
65
is($CLASS->skip(), 'Release test, set the $RELEASE_TESTING environment variable to run it', "will skip");
76

87
$ENV{RELEASE_TESTING} = 1;

cpan/Test2-Suite/t/regression/291-async-subtest-done-testing.t

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
use Test2::V0;
2+
3+
BEGIN {
4+
require Config;
5+
skip_all('no fork')
6+
unless ($Config::Config{d_fork} or $Config::Config{d_pseudofork});
7+
}
8+
29
use Test2::Tools::AsyncSubtest qw/fork_subtest/;
310

411
my $st = fork_subtest foo => sub {

t/porting/customized.dat

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ MIME::Base64 cpan/MIME-Base64/lib/MIME/Base64.pm 18e38d197c7c83f96b24f48bef514e9
1111
MIME::Base64 cpan/MIME-Base64/lib/MIME/QuotedPrint.pm 36cbb455ab57b9bbca7e86f50987c8b1df1a8122
1212
Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm 582be34c077c9ff44d99914724a0cc2140bcd48c
1313
Scalar::Util cpan/Scalar-List-Utils/t/uniqnum.t 553b0df79a084015b39e4ae9774f801c9eafeb4c
14+
Test2::Suite cpan/Test2-Suite/t/modules/Require/AutomatedTesting.t 87095a0ad2ef036d95861aad55b2d2118859abc9
15+
Test2::Suite cpan/Test2-Suite/t/modules/Require/ExtendedTesting.t 47f28c9bccf130983827637c42b7026d8f70aa69
16+
Test2::Suite cpan/Test2-Suite/t/modules/Require/NonInteractiveTesting.t 05e6835384ff054d5fa1b2d62b0401c7944a7a52
17+
Test2::Suite cpan/Test2-Suite/t/modules/Require/ReleaseTesting.t 1eb2d643a4ff304131769de79eac3a6525b4fbe0
18+
Test2::Suite cpan/Test2-Suite/t/regression/291-async-subtest-done-testing.t e1d1145da23a2d1bfd9bbe126e9c4d7e5198f259
1419
Time::Piece cpan/Time-Piece/Piece.pm 8cec8b66183ceddb9bf2b6af35dcdd345bc9adfa
1520
Time::Piece cpan/Time-Piece/Piece.xs 543152540ee17788a638b2c5746b86c3d04401d1
1621
Win32API::File cpan/Win32API-File/File.pm 8fd212857f821cb26648878b96e57f13bf21b99e
1722
Win32API::File cpan/Win32API-File/File.xs beb870fed4490d2faa547b4a8576b8d64d1d27c5
18-
podlators cpan/podlators/lib/Pod/Man.pm 830bd4708c735e7ddfc3622c58f005ed68647357
19-
podlators cpan/podlators/lib/Pod/ParseLink.pm ed1b133f2abf739b1d7d480a9c0285a2b7441d6a
20-
podlators cpan/podlators/lib/Pod/Text.pm c454bab685ca35bccdcd8e87bc4a0922f6fc77f7
21-
podlators cpan/podlators/lib/Pod/Text/Color.pm 318662cdfdd07a95be82c3080106ed1d410e18e0
22-
podlators cpan/podlators/lib/Pod/Text/Overstrike.pm ac9e6c6483aa785a4cd9b0ded64130a52e5178c9
23-
podlators cpan/podlators/lib/Pod/Text/Termcap.pm dc5c03b6310febae555202480bdcf8877c16efa8
2423
version cpan/version/lib/version.pm 8080cfe1fb21d5248c8ff5133b298d249d11e8e8

0 commit comments

Comments
 (0)