From: Chris 'BinGOs' Williams Date: Wed, 13 Nov 2013 00:33:27 +0000 (+0000) Subject: Update Test-Harness to CPAN version 3.30 X-Git-Tag: upstream/5.20.0~1255 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=406e3fef7f4bebd2003087bce74d22303981ac48;p=platform%2Fupstream%2Fperl.git Update Test-Harness to CPAN version 3.30 [DELTA] 3.30 2013-11-12 - Fix missing parent prereq in META.{yml,json} and NotBuild.PL (Dagfinn Ilmari Mannsåker, #89650) - Respect PERL5LIB in tainting source handler test (Dagfinn Ilmari Mannsåker, Leon Timmermans) - Use base instead of parent: This dist is used for testing all other modules, so it should avoid having any non-core prerequisites. Having parent as a prereq leads to a circular dependency of parent -> Test::More -> Test::Harness. (Graham Knop) - Various POD fixes (Nathan Gary Glenn) - Don't localize all of %ENV in harness.t (Craig Berry) - Give TAP::Harness::Beyond a unique NAME (Leon Timmermans) --- diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 295f2ed..3746b33 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1060,7 +1060,7 @@ use File::Glob qw(:case); }, 'Test::Harness' => { - 'DISTRIBUTION' => 'OVID/Test-Harness-3.29.tar.gz', + 'DISTRIBUTION' => 'LEONT/Test-Harness-3.30.tar.gz', 'FILES' => q[cpan/Test-Harness], 'EXCLUDED' => [ qr{^examples/}, diff --git a/cpan/Test-Harness/bin/prove b/cpan/Test-Harness/bin/prove index 46b0453..968fa73 100644 --- a/cpan/Test-Harness/bin/prove +++ b/cpan/Test-Harness/bin/prove @@ -107,12 +107,12 @@ matching the pattern C. =head2 Colored Test Output -Colored test output is the default, but if output is not to a -terminal, color is disabled. You can override this by adding the -C<--color> switch. +Colored test output using L is the default, but +if output is not to a terminal, color is disabled. You can override this by +adding the C<--color> switch. Color support requires L on Unix-like platforms and -L windows. If the necessary module is not installed +L on windows. If the necessary module is not installed colored output will not be available. =head2 Exit Code @@ -274,7 +274,7 @@ be specified multiple times, and the order matters. The most practical use is likely to specify that some tests are not "parallel-ready". Since mentioning a file with --rules doesn't cause it to -selected to run as a test, you can "set and forget" some rules preferences in +be selected to run as a test, you can "set and forget" some rules preferences in your .proverc file. Then you'll be able to take maximum advantage of the performance benefits of parallel testing, while some exceptions are still run in parallel. @@ -299,7 +299,7 @@ in parallel. =item * The existence of a rule does not imply selecting a test. You must still specify the tests to run. -=item * Specifying a rule to allow tests to run in parallel does not make the run in parallel. You still need specify the number of parallel C in your Harness object. +=item * Specifying a rule to allow tests to run in parallel does not make them run in parallel. You still need specify the number of parallel C in your Harness object. =back @@ -314,7 +314,7 @@ supported patterns: {foo,bar,baz} is any of foo, bar or baz. \ is an escape character -=head3 More advance specifications for parallel vs sequence run rules +=head3 More advanced specifications for parallel vs sequence run rules If you need more advanced management of what runs in parallel vs in sequence, see the associated 'rules' documentation in L and L. diff --git a/cpan/Test-Harness/lib/App/Prove.pm b/cpan/Test-Harness/lib/App/Prove.pm index c149f69..44aaf6d 100644 --- a/cpan/Test-Harness/lib/App/Prove.pm +++ b/cpan/Test-Harness/lib/App/Prove.pm @@ -10,7 +10,7 @@ use Getopt::Long; use App::Prove::State; use Carp; -use parent 'TAP::Object'; +use base 'TAP::Object'; =head1 NAME @@ -18,11 +18,11 @@ App::Prove - Implements the C command. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/App/Prove/State.pm b/cpan/Test-Harness/lib/App/Prove/State.pm index b5807ff..519ba01 100644 --- a/cpan/Test-Harness/lib/App/Prove/State.pm +++ b/cpan/Test-Harness/lib/App/Prove/State.pm @@ -10,7 +10,7 @@ use Carp; use App::Prove::State::Result; use TAP::Parser::YAMLish::Reader (); use TAP::Parser::YAMLish::Writer (); -use parent 'TAP::Base'; +use base 'TAP::Base'; BEGIN { __PACKAGE__->mk_methods('result_class'); @@ -25,11 +25,11 @@ App::Prove::State - State storage for the C command. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/App/Prove/State/Result.pm b/cpan/Test-Harness/lib/App/Prove/State/Result.pm index 93a82b1..8e44ea3 100644 --- a/cpan/Test-Harness/lib/App/Prove/State/Result.pm +++ b/cpan/Test-Harness/lib/App/Prove/State/Result.pm @@ -14,11 +14,11 @@ App::Prove::State::Result - Individual test suite results. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/App/Prove/State/Result/Test.pm b/cpan/Test-Harness/lib/App/Prove/State/Result/Test.pm index 3aab1f6..21f20a1 100644 --- a/cpan/Test-Harness/lib/App/Prove/State/Result/Test.pm +++ b/cpan/Test-Harness/lib/App/Prove/State/Result/Test.pm @@ -9,11 +9,11 @@ App::Prove::State::Result::Test - Individual test results. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Base.pm b/cpan/Test-Harness/lib/TAP/Base.pm index 5a5ea77..02f8b5e 100644 --- a/cpan/Test-Harness/lib/TAP/Base.pm +++ b/cpan/Test-Harness/lib/TAP/Base.pm @@ -3,7 +3,7 @@ package TAP::Base; use strict; use warnings; -use parent 'TAP::Object'; +use base 'TAP::Object'; =head1 NAME @@ -12,11 +12,11 @@ and L =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; use constant GOT_TIME_HIRES => do { eval 'use Time::HiRes qw(time);'; @@ -27,7 +27,7 @@ use constant GOT_TIME_HIRES => do { package TAP::Whatever; - use parent 'TAP::Base'; + use base 'TAP::Base'; # ... later ... diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Base.pm b/cpan/Test-Harness/lib/TAP/Formatter/Base.pm index ed6e848..1bb357d 100644 --- a/cpan/Test-Harness/lib/TAP/Formatter/Base.pm +++ b/cpan/Test-Harness/lib/TAP/Formatter/Base.pm @@ -2,7 +2,7 @@ package TAP::Formatter::Base; use strict; use warnings; -use parent 'TAP::Base'; +use base 'TAP::Base'; use POSIX qw(strftime); my $MAX_ERRORS = 5; @@ -58,11 +58,11 @@ TAP::Formatter::Base - Base class for harness output delegates =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Color.pm b/cpan/Test-Harness/lib/TAP/Formatter/Color.pm index b3845e6..d22752e 100644 --- a/cpan/Test-Harness/lib/TAP/Formatter/Color.pm +++ b/cpan/Test-Harness/lib/TAP/Formatter/Color.pm @@ -5,7 +5,7 @@ use warnings; use constant IS_WIN32 => ( $^O =~ /^(MS)?Win32$/ ); -use parent 'TAP::Object'; +use base 'TAP::Object'; my $NO_COLOR; @@ -71,11 +71,11 @@ TAP::Formatter::Color - Run Perl test scripts with color =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Console.pm b/cpan/Test-Harness/lib/TAP/Formatter/Console.pm index 975b91b..5ac9fa1 100644 --- a/cpan/Test-Harness/lib/TAP/Formatter/Console.pm +++ b/cpan/Test-Harness/lib/TAP/Formatter/Console.pm @@ -2,7 +2,7 @@ package TAP::Formatter::Console; use strict; use warnings; -use parent 'TAP::Formatter::Base'; +use base 'TAP::Formatter::Base'; use POSIX qw(strftime); =head1 NAME @@ -11,11 +11,11 @@ TAP::Formatter::Console - Harness output delegate for default console output =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Console/ParallelSession.pm b/cpan/Test-Harness/lib/TAP/Formatter/Console/ParallelSession.pm index 1c92403..f9cd7af 100644 --- a/cpan/Test-Harness/lib/TAP/Formatter/Console/ParallelSession.pm +++ b/cpan/Test-Harness/lib/TAP/Formatter/Console/ParallelSession.pm @@ -6,7 +6,7 @@ use File::Spec; use File::Path; use Carp; -use parent 'TAP::Formatter::Console::Session'; +use base 'TAP::Formatter::Console::Session'; use constant WIDTH => 72; # Because Eric says @@ -41,11 +41,11 @@ TAP::Formatter::Console::ParallelSession - Harness output delegate for parallel =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Console/Session.pm b/cpan/Test-Harness/lib/TAP/Formatter/Console/Session.pm index bb3a641..16ce971 100644 --- a/cpan/Test-Harness/lib/TAP/Formatter/Console/Session.pm +++ b/cpan/Test-Harness/lib/TAP/Formatter/Console/Session.pm @@ -3,7 +3,7 @@ package TAP::Formatter::Console::Session; use strict; use warnings; -use parent 'TAP::Formatter::Session'; +use base 'TAP::Formatter::Session'; my @ACCESSOR; @@ -26,11 +26,11 @@ TAP::Formatter::Console::Session - Harness output delegate for default console o =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Formatter/File.pm b/cpan/Test-Harness/lib/TAP/Formatter/File.pm index cc312fe..2e72d91 100644 --- a/cpan/Test-Harness/lib/TAP/Formatter/File.pm +++ b/cpan/Test-Harness/lib/TAP/Formatter/File.pm @@ -5,7 +5,7 @@ use warnings; use TAP::Formatter::File::Session; use POSIX qw(strftime); -use parent 'TAP::Formatter::Base'; +use base 'TAP::Formatter::Base'; =head1 NAME @@ -13,11 +13,11 @@ TAP::Formatter::File - Harness output delegate for file output =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Formatter/File/Session.pm b/cpan/Test-Harness/lib/TAP/Formatter/File/Session.pm index 5ec4ede..4719f22 100644 --- a/cpan/Test-Harness/lib/TAP/Formatter/File/Session.pm +++ b/cpan/Test-Harness/lib/TAP/Formatter/File/Session.pm @@ -2,7 +2,7 @@ package TAP::Formatter::File::Session; use strict; use warnings; -use parent 'TAP::Formatter::Session'; +use base 'TAP::Formatter::Session'; =head1 NAME @@ -10,11 +10,11 @@ TAP::Formatter::File::Session - Harness output delegate for file output =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Session.pm b/cpan/Test-Harness/lib/TAP/Formatter/Session.pm index 478e498..120b495 100644 --- a/cpan/Test-Harness/lib/TAP/Formatter/Session.pm +++ b/cpan/Test-Harness/lib/TAP/Formatter/Session.pm @@ -3,7 +3,7 @@ package TAP::Formatter::Session; use strict; use warnings; -use parent 'TAP::Base'; +use base 'TAP::Base'; my @ACCESSOR; @@ -23,11 +23,11 @@ TAP::Formatter::Session - Abstract base class for harness output delegate =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 METHODS diff --git a/cpan/Test-Harness/lib/TAP/Harness.pm b/cpan/Test-Harness/lib/TAP/Harness.pm index 72b4d0e..53d8d18 100644 --- a/cpan/Test-Harness/lib/TAP/Harness.pm +++ b/cpan/Test-Harness/lib/TAP/Harness.pm @@ -8,7 +8,7 @@ use File::Spec; use File::Path; use IO::Handle; -use parent 'TAP::Base'; +use base 'TAP::Base'; =head1 NAME @@ -16,11 +16,11 @@ TAP::Harness - Run test scripts with statistics =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; $ENV{HARNESS_ACTIVE} = 1; $ENV{HARNESS_VERSION} = $VERSION; diff --git a/cpan/Test-Harness/lib/TAP/Harness/Beyond.pod b/cpan/Test-Harness/lib/TAP/Harness/Beyond.pod index 1537be3..b70564e 100644 --- a/cpan/Test-Harness/lib/TAP/Harness/Beyond.pod +++ b/cpan/Test-Harness/lib/TAP/Harness/Beyond.pod @@ -1,6 +1,6 @@ =head1 NAME -Test::Harness - Beyond make test +Test::Harness::Beyond - Beyond make test =head1 Beyond make test @@ -227,7 +227,7 @@ document: package My::TAP::Harness; - use parent 'TAP::Harness'; + use base 'TAP::Harness'; use YAML; sub summary { diff --git a/cpan/Test-Harness/lib/TAP/Harness/Env.pm b/cpan/Test-Harness/lib/TAP/Harness/Env.pm index 92e7d3b..1a9d719 100644 --- a/cpan/Test-Harness/lib/TAP/Harness/Env.pm +++ b/cpan/Test-Harness/lib/TAP/Harness/Env.pm @@ -7,7 +7,7 @@ use constant IS_VMS => ( $^O eq 'VMS' ); use TAP::Object; use Text::ParseWords qw/shellwords/; -our $VERSION = '3.29'; +our $VERSION = '3.30'; # Get the parts of @INC which are changed from the stock list AND # preserve reordering of stock directories. @@ -126,7 +126,7 @@ TAP::Harness::Env - Parsing harness related environmental variables where approp =head1 VERSION -Version 3.29 +Version 3.30 =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Object.pm b/cpan/Test-Harness/lib/TAP/Object.pm index cb2923e..21c53dc 100644 --- a/cpan/Test-Harness/lib/TAP/Object.pm +++ b/cpan/Test-Harness/lib/TAP/Object.pm @@ -9,11 +9,11 @@ TAP::Object - Base class that provides common functionality to all C mod =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS @@ -21,7 +21,7 @@ our $VERSION = '3.29'; use strict; - use parent 'TAP::Object'; + use base 'TAP::Object'; # new() implementation by TAP::Object sub _initialize { diff --git a/cpan/Test-Harness/lib/TAP/Parser.pm b/cpan/Test-Harness/lib/TAP/Parser.pm index 3fb2496..1ebb0db 100644 --- a/cpan/Test-Harness/lib/TAP/Parser.pm +++ b/cpan/Test-Harness/lib/TAP/Parser.pm @@ -17,7 +17,7 @@ use TAP::Parser::SourceHandler::Handle (); use Carp qw( confess ); -use parent 'TAP::Base'; +use base 'TAP::Base'; =encoding utf8 @@ -27,11 +27,11 @@ TAP::Parser - Parse L output =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; my $DEFAULT_TAP_VERSION = 12; my $MAX_TAP_VERSION = 13; diff --git a/cpan/Test-Harness/lib/TAP/Parser/Aggregator.pm b/cpan/Test-Harness/lib/TAP/Parser/Aggregator.pm index a887abe..ee4befd 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Aggregator.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Aggregator.pm @@ -4,7 +4,7 @@ use strict; use warnings; use Benchmark; -use parent 'TAP::Object'; +use base 'TAP::Object'; =head1 NAME @@ -12,11 +12,11 @@ TAP::Parser::Aggregator - Aggregate TAP::Parser results =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/Grammar.pm b/cpan/Test-Harness/lib/TAP/Parser/Grammar.pm index 63b52cb..fe1b9ad 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Grammar.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Grammar.pm @@ -6,7 +6,7 @@ use warnings; use TAP::Parser::ResultFactory (); use TAP::Parser::YAMLish::Reader (); -use parent 'TAP::Object'; +use base 'TAP::Object'; =head1 NAME @@ -14,11 +14,11 @@ TAP::Parser::Grammar - A grammar for the Test Anything Protocol. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/Iterator.pm b/cpan/Test-Harness/lib/TAP/Parser/Iterator.pm index 6fb232b..886f5f4 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Iterator.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Iterator.pm @@ -3,7 +3,7 @@ package TAP::Parser::Iterator; use strict; use warnings; -use parent 'TAP::Object'; +use base 'TAP::Object'; =head1 NAME @@ -11,17 +11,17 @@ TAP::Parser::Iterator - Base class for TAP source iterators =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS # to subclass: use TAP::Parser::Iterator (); - use parent 'TAP::Parser::Iterator'; + use base 'TAP::Parser::Iterator'; sub _initialize { # see TAP::Object... } diff --git a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Array.pm b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Array.pm index c1bb576..929b100 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Array.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Array.pm @@ -3,7 +3,7 @@ package TAP::Parser::Iterator::Array; use strict; use warnings; -use parent 'TAP::Parser::Iterator'; +use base 'TAP::Parser::Iterator'; =head1 NAME @@ -11,11 +11,11 @@ TAP::Parser::Iterator::Array - Iterator for array-based TAP sources =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Process.pm b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Process.pm index d506a65..aaf6b6c 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Process.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Process.pm @@ -6,7 +6,7 @@ use warnings; use Config; use IO::Handle; -use parent 'TAP::Parser::Iterator'; +use base 'TAP::Parser::Iterator'; my $IS_WIN32 = ( $^O =~ /^(MS)?Win32$/ ); @@ -16,11 +16,11 @@ TAP::Parser::Iterator::Process - Iterator for process-based TAP sources =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS @@ -157,9 +157,7 @@ sub _initialize { }; die "Could not execute (@command): $@" if $@; if ( $] >= 5.006 ) { - - # Kludge to avoid warning under 5.5 - eval 'binmode($out, ":crlf")'; + binmode($out, ":crlf"); } } else { diff --git a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Stream.pm b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Stream.pm index b3abad6..9181fc7 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Stream.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Stream.pm @@ -3,7 +3,7 @@ package TAP::Parser::Iterator::Stream; use strict; use warnings; -use parent 'TAP::Parser::Iterator'; +use base 'TAP::Parser::Iterator'; =head1 NAME @@ -11,11 +11,11 @@ TAP::Parser::Iterator::Stream - Iterator for filehandle-based TAP sources =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/IteratorFactory.pm b/cpan/Test-Harness/lib/TAP/Parser/IteratorFactory.pm index 94a605c..8b75724 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/IteratorFactory.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/IteratorFactory.pm @@ -6,7 +6,7 @@ use warnings; use Carp qw( confess ); use File::Basename qw( fileparse ); -use parent 'TAP::Object'; +use base 'TAP::Object'; use constant handlers => []; @@ -16,11 +16,11 @@ TAP::Parser::IteratorFactory - Figures out which SourceHandler objects to use fo =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS @@ -301,7 +301,7 @@ But in case you find the need to... use strict; - use parent 'TAP::Parser::IteratorFactory'; + use base 'TAP::Parser::IteratorFactory'; # override source detection algorithm sub detect_source { diff --git a/cpan/Test-Harness/lib/TAP/Parser/Multiplexer.pm b/cpan/Test-Harness/lib/TAP/Parser/Multiplexer.pm index 68457a8..65cd46d 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Multiplexer.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Multiplexer.pm @@ -5,7 +5,7 @@ use warnings; use IO::Select; -use parent 'TAP::Object'; +use base 'TAP::Object'; use constant IS_WIN32 => $^O =~ /^(MS)?Win32$/; use constant IS_VMS => $^O eq 'VMS'; @@ -17,11 +17,11 @@ TAP::Parser::Multiplexer - Multiplex multiple TAP::Parsers =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result.pm b/cpan/Test-Harness/lib/TAP/Parser/Result.pm index b29e155..eaad1d2 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Result.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Result.pm @@ -3,7 +3,7 @@ package TAP::Parser::Result; use strict; use warnings; -use parent 'TAP::Object'; +use base 'TAP::Object'; BEGIN { @@ -24,11 +24,11 @@ TAP::Parser::Result - Base class for TAP::Parser output objects =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS @@ -273,7 +273,7 @@ subclass L too, or else it'll never get used. use strict; - use parent 'TAP::Parser::Result'; + use base 'TAP::Parser::Result'; # register with the factory: TAP::Parser::ResultFactory->register_type( 'my_type' => __PACKAGE__ ); diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Bailout.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Bailout.pm index a80b6ee..2ae35d6 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Result/Bailout.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Bailout.pm @@ -3,7 +3,7 @@ package TAP::Parser::Result::Bailout; use strict; use warnings; -use parent 'TAP::Parser::Result'; +use base 'TAP::Parser::Result'; =head1 NAME @@ -11,11 +11,11 @@ TAP::Parser::Result::Bailout - Bailout result token. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Comment.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Comment.pm index 1c327b0..d69ec51 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Result/Comment.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Comment.pm @@ -3,7 +3,7 @@ package TAP::Parser::Result::Comment; use strict; use warnings; -use parent 'TAP::Parser::Result'; +use base 'TAP::Parser::Result'; =head1 NAME @@ -11,11 +11,11 @@ TAP::Parser::Result::Comment - Comment result token. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Plan.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Plan.pm index 9b10c6f..d85243c 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Result/Plan.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Plan.pm @@ -3,7 +3,7 @@ package TAP::Parser::Result::Plan; use strict; use warnings; -use parent 'TAP::Parser::Result'; +use base 'TAP::Parser::Result'; =head1 NAME @@ -11,11 +11,11 @@ TAP::Parser::Result::Plan - Plan result token. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Pragma.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Pragma.pm index 528d0ca..1479e88 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Result/Pragma.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Pragma.pm @@ -3,7 +3,7 @@ package TAP::Parser::Result::Pragma; use strict; use warnings; -use parent 'TAP::Parser::Result'; +use base 'TAP::Parser::Result'; =head1 NAME @@ -11,11 +11,11 @@ TAP::Parser::Result::Pragma - TAP pragma token. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Test.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Test.pm index 7366048..749f26c 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Result/Test.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Test.pm @@ -3,7 +3,7 @@ package TAP::Parser::Result::Test; use strict; use warnings; -use parent 'TAP::Parser::Result'; +use base 'TAP::Parser::Result'; =head1 NAME @@ -11,11 +11,11 @@ TAP::Parser::Result::Test - Test result token. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Unknown.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Unknown.pm index fa2f7cc..3e1a611 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Result/Unknown.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Unknown.pm @@ -3,7 +3,7 @@ package TAP::Parser::Result::Unknown; use strict; use warnings; -use parent 'TAP::Parser::Result'; +use base 'TAP::Parser::Result'; =head1 NAME @@ -11,11 +11,11 @@ TAP::Parser::Result::Unknown - Unknown result token. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Version.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Version.pm index 8c7f24c..8b08e33 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Result/Version.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Version.pm @@ -3,7 +3,7 @@ package TAP::Parser::Result::Version; use strict; use warnings; -use parent 'TAP::Parser::Result'; +use base 'TAP::Parser::Result'; =head1 NAME @@ -11,11 +11,11 @@ TAP::Parser::Result::Version - TAP syntax version token. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/YAML.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/YAML.pm index ad0547e..a6f86e3 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Result/YAML.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Result/YAML.pm @@ -3,7 +3,7 @@ package TAP::Parser::Result::YAML; use strict; use warnings; -use parent 'TAP::Parser::Result'; +use base 'TAP::Parser::Result'; =head1 NAME @@ -11,11 +11,11 @@ TAP::Parser::Result::YAML - YAML result token. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 DESCRIPTION diff --git a/cpan/Test-Harness/lib/TAP/Parser/ResultFactory.pm b/cpan/Test-Harness/lib/TAP/Parser/ResultFactory.pm index cf6dddd..65d31d2 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/ResultFactory.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/ResultFactory.pm @@ -12,7 +12,7 @@ use TAP::Parser::Result::Unknown (); use TAP::Parser::Result::Version (); use TAP::Parser::Result::YAML (); -use parent 'TAP::Object'; +use base 'TAP::Object'; ############################################################################## @@ -29,11 +29,11 @@ TAP::Parser::ResultFactory - Factory for creating TAP::Parser output objects =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head2 DESCRIPTION @@ -82,7 +82,7 @@ a completely new type, eg: # create a custom result type: package MyResult; use strict; - use parent 'TAP::Parser::Result'; + use base 'TAP::Parser::Result'; # register with the factory: TAP::Parser::ResultFactory->register_type( 'my_type' => __PACKAGE__ ); @@ -165,7 +165,7 @@ Of course, it's up to you to decide whether or not to ignore them. use MyResult; - use parent 'TAP::Parser::ResultFactory'; + use base 'TAP::Parser::ResultFactory'; # force all results to be 'MyResult' sub class_for { diff --git a/cpan/Test-Harness/lib/TAP/Parser/Scheduler.pm b/cpan/Test-Harness/lib/TAP/Parser/Scheduler.pm index eef1a3b..7c5cedf 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Scheduler.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Scheduler.pm @@ -13,11 +13,11 @@ TAP::Parser::Scheduler - Schedule tests during parallel testing =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Job.pm b/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Job.pm index 30e2bbb..6375a7b 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Job.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Job.pm @@ -10,11 +10,11 @@ TAP::Parser::Scheduler::Job - A single testing job. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Spinner.pm b/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Spinner.pm index 4792e04..f590ea5 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Spinner.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Spinner.pm @@ -10,11 +10,11 @@ TAP::Parser::Scheduler::Spinner - A no-op job. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/Source.pm b/cpan/Test-Harness/lib/TAP/Parser/Source.pm index 0de4407..0e2da09 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/Source.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/Source.pm @@ -4,7 +4,7 @@ use strict; use warnings; use File::Basename qw( fileparse ); -use parent 'TAP::Object'; +use base 'TAP::Object'; use constant BLK_SIZE => 512; @@ -14,11 +14,11 @@ TAP::Parser::Source - a TAP source & meta data about it =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS @@ -327,7 +327,7 @@ May be called as a class method open my $fh, '<', $file or die "Can't read $file: $!\n"; # Might be a binary file - so read a fixed number of bytes. - my $got = read $fh, my $buf, BLK_SIZE; + my $got = read $fh, my ($buf), BLK_SIZE; defined $got or die "I/O error: $!\n"; return $1 if $buf =~ /(.*)/; return; diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler.pm index 3b4f327..dc257e0 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler.pm @@ -4,7 +4,7 @@ use strict; use warnings; use TAP::Parser::Iterator (); -use parent 'TAP::Object'; +use base 'TAP::Object'; =head1 NAME @@ -12,11 +12,11 @@ TAP::Parser::SourceHandler - Base class for different TAP source handlers =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS @@ -25,7 +25,7 @@ our $VERSION = '3.29'; # must be sub-classed for use package MySourceHandler; - use parent 'TAP::Parser::SourceHandler'; + use base 'TAP::Parser::SourceHandler'; sub can_handle { return $confidence_level } sub make_iterator { return $iterator } @@ -125,7 +125,7 @@ L. use MySourceHandler; # see TAP::Parser::SourceHandler use TAP::Parser::IteratorFactory; - use parent 'TAP::Parser::SourceHandler'; + use base 'TAP::Parser::SourceHandler'; TAP::Parser::IteratorFactory->register_handler( __PACKAGE__ ); diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Executable.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Executable.pm index def5e0a..5522625 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Executable.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Executable.pm @@ -6,7 +6,7 @@ use warnings; use TAP::Parser::IteratorFactory (); use TAP::Parser::Iterator::Process (); -use parent 'TAP::Parser::SourceHandler'; +use base 'TAP::Parser::SourceHandler'; TAP::Parser::IteratorFactory->register_handler(__PACKAGE__); @@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::Executable - Stream output from an executable TAP so =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS @@ -159,7 +159,7 @@ Please see L for a subclassing overview. use Carp qw( croak ); use TAP::Parser::SourceHandler::Executable; - use parent 'TAP::Parser::SourceHandler::Executable'; + use base 'TAP::Parser::SourceHandler::Executable'; # expect $handler->(['mytest.rb', 'cmdline', 'args']); sub make_iterator { diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/File.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/File.pm index e2a4b08..b48660f 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/File.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/File.pm @@ -6,7 +6,7 @@ use warnings; use TAP::Parser::IteratorFactory (); use TAP::Parser::Iterator::Stream (); -use parent 'TAP::Parser::SourceHandler'; +use base 'TAP::Parser::SourceHandler'; TAP::Parser::IteratorFactory->register_handler(__PACKAGE__); @@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::File - Stream TAP from a text file. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Handle.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Handle.pm index f4ad338..944fb2a 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Handle.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Handle.pm @@ -6,7 +6,7 @@ use warnings; use TAP::Parser::IteratorFactory (); use TAP::Parser::Iterator::Stream (); -use parent 'TAP::Parser::SourceHandler'; +use base 'TAP::Parser::SourceHandler'; TAP::Parser::IteratorFactory->register_handler(__PACKAGE__); @@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::Handle - Stream TAP from an IO::Handle or a GLOB. =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Perl.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Perl.pm index f371673..1a1867b 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Perl.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Perl.pm @@ -11,7 +11,7 @@ use TAP::Parser::IteratorFactory (); use TAP::Parser::Iterator::Process (); use Text::ParseWords qw(shellwords); -use parent 'TAP::Parser::SourceHandler::Executable'; +use base 'TAP::Parser::SourceHandler::Executable'; TAP::Parser::IteratorFactory->register_handler(__PACKAGE__); @@ -21,11 +21,11 @@ TAP::Parser::SourceHandler::Perl - Stream TAP from a Perl executable =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS @@ -344,7 +344,7 @@ Please see L for a subclassing overview. use TAP::Parser::SourceHandler::Perl; - use parent 'TAP::Parser::SourceHandler::Perl'; + use base 'TAP::Parser::SourceHandler::Perl'; # use the version of perl from the shebang line in the test file sub get_perl { diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/RawTAP.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/RawTAP.pm index c72d5ad..627a1e1 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/RawTAP.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/RawTAP.pm @@ -6,7 +6,7 @@ use warnings; use TAP::Parser::IteratorFactory (); use TAP::Parser::Iterator::Array (); -use parent 'TAP::Parser::SourceHandler'; +use base 'TAP::Parser::SourceHandler'; TAP::Parser::IteratorFactory->register_handler(__PACKAGE__); @@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::RawTAP - Stream output from raw TAP in a scalar/arra =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm b/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm index 200fc22..8a61a4b 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm @@ -3,9 +3,9 @@ package TAP::Parser::YAMLish::Reader; use strict; use warnings; -use parent 'TAP::Object'; +use base 'TAP::Object'; -our $VERSION = '3.29'; +our $VERSION = '3.30'; # TODO: # Handle blessed object syntax @@ -269,7 +269,7 @@ TAP::Parser::YAMLish::Reader - Read YAMLish data from iterator =head1 VERSION -Version 3.29 +Version 3.30 =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm b/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm index ff90f42..811c190 100644 --- a/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm +++ b/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm @@ -3,9 +3,9 @@ package TAP::Parser::YAMLish::Writer; use strict; use warnings; -use parent 'TAP::Object'; +use base 'TAP::Object'; -our $VERSION = '3.29'; +our $VERSION = '3.30'; my $ESCAPE_CHAR = qr{ [ \x00-\x1f \" ] }x; my $ESCAPE_KEY = qr{ (?: ^\W ) | $ESCAPE_CHAR }x; @@ -146,7 +146,7 @@ TAP::Parser::YAMLish::Writer - Write YAMLish data =head1 VERSION -Version 3.29 +Version 3.30 =head1 SYNOPSIS diff --git a/cpan/Test-Harness/lib/Test/Harness.pm b/cpan/Test-Harness/lib/Test/Harness.pm index a3b8de7..aa54574 100644 --- a/cpan/Test-Harness/lib/Test/Harness.pm +++ b/cpan/Test-Harness/lib/Test/Harness.pm @@ -16,7 +16,7 @@ use TAP::Parser::SourceHandler::Perl (); use Text::ParseWords qw(shellwords); use Config; -use parent 'Exporter'; +use base 'Exporter'; # $ML $Last_ML_Print @@ -31,11 +31,11 @@ Test::Harness - Run Perl standard test scripts with statistics =head1 VERSION -Version 3.29 +Version 3.30 =cut -our $VERSION = '3.29'; +our $VERSION = '3.30'; # Backwards compatibility for exportable variable names. *verbose = *Verbose; diff --git a/cpan/Test-Harness/t/base.t b/cpan/Test-Harness/t/base.t index f348da3..b6291d2 100644 --- a/cpan/Test-Harness/t/base.t +++ b/cpan/Test-Harness/t/base.t @@ -54,7 +54,7 @@ use TAP::Base; package CallbackOK; use TAP::Base; -use parent 'TAP::Base'; +use base 'TAP::Base'; sub _initialize { my $self = shift; diff --git a/cpan/Test-Harness/t/harness.t b/cpan/Test-Harness/t/harness.t index 63ea841..e86c455 100644 --- a/cpan/Test-Harness/t/harness.t +++ b/cpan/Test-Harness/t/harness.t @@ -14,7 +14,8 @@ use TAP::Harness; # This is done to prevent the colors environment variables from # interfering. -local %ENV = %ENV; +local $ENV{HARNESS_SUMMARY_COLOR_FAIL}; +local $ENV{HARNESS_SUMMARY_COLOR_SUCCESS}; delete $ENV{HARNESS_SUMMARY_COLOR_FAIL}; delete $ENV{HARNESS_SUMMARY_COLOR_SUCCESS}; diff --git a/cpan/Test-Harness/t/iterators.t b/cpan/Test-Harness/t/iterators.t index 4fa92f3..57e2040 100644 --- a/cpan/Test-Harness/t/iterators.t +++ b/cpan/Test-Harness/t/iterators.t @@ -29,7 +29,7 @@ my $setup = sub { $did_setup++ }; my $teardown = sub { $did_teardown++ }; package NoForkProcess; -use parent qw( TAP::Parser::Iterator::Process ); +use base qw( TAP::Parser::Iterator::Process ); sub _use_open3 {return} diff --git a/cpan/Test-Harness/t/lib/EmptyParser.pm b/cpan/Test-Harness/t/lib/EmptyParser.pm index 0e4c29f..3c6e67a 100644 --- a/cpan/Test-Harness/t/lib/EmptyParser.pm +++ b/cpan/Test-Harness/t/lib/EmptyParser.pm @@ -3,7 +3,7 @@ package EmptyParser; use strict; use warnings; -use parent qw(TAP::Parser); +use base qw(TAP::Parser); sub _initialize { shift->_set_defaults; diff --git a/cpan/Test-Harness/t/lib/MyFileSourceHandler.pm b/cpan/Test-Harness/t/lib/MyFileSourceHandler.pm index 14032f5..f8899a5 100644 --- a/cpan/Test-Harness/t/lib/MyFileSourceHandler.pm +++ b/cpan/Test-Harness/t/lib/MyFileSourceHandler.pm @@ -8,7 +8,7 @@ our ($LAST_OBJ, $CAN_HANDLE, $MAKE_ITER, $LAST_SOURCE); use TAP::Parser::IteratorFactory; -use parent qw( TAP::Parser::SourceHandler::File MyCustom ); +use base qw( TAP::Parser::SourceHandler::File MyCustom ); $LAST_OBJ = undef; $CAN_HANDLE = undef; $MAKE_ITER = undef; diff --git a/cpan/Test-Harness/t/lib/MyGrammar.pm b/cpan/Test-Harness/t/lib/MyGrammar.pm index 5e1c934..c4bbda0 100644 --- a/cpan/Test-Harness/t/lib/MyGrammar.pm +++ b/cpan/Test-Harness/t/lib/MyGrammar.pm @@ -5,7 +5,7 @@ package MyGrammar; use strict; use warnings; -use parent qw( TAP::Parser::Grammar MyCustom ); +use base qw( TAP::Parser::Grammar MyCustom ); sub _initialize { my $self = shift; diff --git a/cpan/Test-Harness/t/lib/MyIterator.pm b/cpan/Test-Harness/t/lib/MyIterator.pm index 7898006..fb3039d 100644 --- a/cpan/Test-Harness/t/lib/MyIterator.pm +++ b/cpan/Test-Harness/t/lib/MyIterator.pm @@ -5,7 +5,7 @@ package MyIterator; use strict; use warnings; -use parent qw( TAP::Parser::Iterator MyCustom ); +use base qw( TAP::Parser::Iterator MyCustom ); sub _initialize { my $self = shift; diff --git a/cpan/Test-Harness/t/lib/MyPerlSourceHandler.pm b/cpan/Test-Harness/t/lib/MyPerlSourceHandler.pm index 7ba3727..dda7950 100644 --- a/cpan/Test-Harness/t/lib/MyPerlSourceHandler.pm +++ b/cpan/Test-Harness/t/lib/MyPerlSourceHandler.pm @@ -7,7 +7,7 @@ use warnings; use TAP::Parser::IteratorFactory; -use parent qw( TAP::Parser::SourceHandler::Perl MyCustom ); +use base qw( TAP::Parser::SourceHandler::Perl MyCustom ); TAP::Parser::IteratorFactory->register_handler(__PACKAGE__); diff --git a/cpan/Test-Harness/t/lib/MyResult.pm b/cpan/Test-Harness/t/lib/MyResult.pm index 7b35ead..30ed516 100644 --- a/cpan/Test-Harness/t/lib/MyResult.pm +++ b/cpan/Test-Harness/t/lib/MyResult.pm @@ -5,7 +5,7 @@ package MyResult; use strict; use warnings; -use parent qw( TAP::Parser::Result MyCustom ); +use base qw( TAP::Parser::Result MyCustom ); sub _initialize { my $self = shift; diff --git a/cpan/Test-Harness/t/lib/MyResultFactory.pm b/cpan/Test-Harness/t/lib/MyResultFactory.pm index a6a2f5d..3d16b71 100644 --- a/cpan/Test-Harness/t/lib/MyResultFactory.pm +++ b/cpan/Test-Harness/t/lib/MyResultFactory.pm @@ -7,7 +7,7 @@ use warnings; use MyResult; -use parent qw( TAP::Parser::ResultFactory MyCustom ); +use base qw( TAP::Parser::ResultFactory MyCustom ); sub make_result { my $class = shift; diff --git a/cpan/Test-Harness/t/lib/MySourceHandler.pm b/cpan/Test-Harness/t/lib/MySourceHandler.pm index 9c0fc69..c508d38 100644 --- a/cpan/Test-Harness/t/lib/MySourceHandler.pm +++ b/cpan/Test-Harness/t/lib/MySourceHandler.pm @@ -9,8 +9,8 @@ use MyIterator; use TAP::Parser::SourceHandler; use TAP::Parser::IteratorFactory; -#use parent qw( TAP::Parser::SourceHandler MyCustom ); -use parent qw( MyCustom ); +#use base qw( TAP::Parser::SourceHandler MyCustom ); +use base qw( MyCustom ); TAP::Parser::IteratorFactory->register_handler(__PACKAGE__); diff --git a/cpan/Test-Harness/t/lib/TAP/Parser/SubclassTest.pm b/cpan/Test-Harness/t/lib/TAP/Parser/SubclassTest.pm index 79487d2..17d4295 100644 --- a/cpan/Test-Harness/t/lib/TAP/Parser/SubclassTest.pm +++ b/cpan/Test-Harness/t/lib/TAP/Parser/SubclassTest.pm @@ -10,7 +10,7 @@ use MyPerlSourceHandler; use MyGrammar; use MyResultFactory; -use parent qw( TAP::Parser MyCustom ); +use base qw( TAP::Parser MyCustom ); sub _default_source_class {'MySourceHandler'} # deprecated sub _default_perl_source_class {'MyPerlSourceHandler'} # deprecated diff --git a/cpan/Test-Harness/t/object.t b/cpan/Test-Harness/t/object.t index 7309224..f80ef6b 100644 --- a/cpan/Test-Harness/t/object.t +++ b/cpan/Test-Harness/t/object.t @@ -15,7 +15,7 @@ can_ok( 'TAP::Object', '_croak' ); { package TAP::TestObj; - use parent qw(TAP::Object); + use base qw(TAP::Object); sub _initialize { my $self = shift; diff --git a/cpan/Test-Harness/t/parse.t b/cpan/Test-Harness/t/parse.t index 8556ce7..cc295ba 100644 --- a/cpan/Test-Harness/t/parse.t +++ b/cpan/Test-Harness/t/parse.t @@ -804,7 +804,7 @@ END_TAP use strict; - use parent qw(TAP::Parser::Iterator); + use base qw(TAP::Parser::Iterator); sub next_raw { die 'this is the dying iterator'; @@ -899,7 +899,7 @@ END_TAP package TAP::Parser::WithBrokenState; - use parent qw( TAP::Parser ); + use base qw( TAP::Parser ); sub _make_state_table { return { INIT => { plan => { goto => 'FOO' } } }; @@ -936,7 +936,7 @@ END_TAP package TAP::Parser::WithBrokenIter; - use parent qw( TAP::Parser ); + use base qw( TAP::Parser ); sub _iter {return} diff --git a/cpan/Test-Harness/t/prove.t b/cpan/Test-Harness/t/prove.t index 72a8994..327fe85 100644 --- a/cpan/Test-Harness/t/prove.t +++ b/cpan/Test-Harness/t/prove.t @@ -17,7 +17,7 @@ use Text::ParseWords qw(shellwords); package FakeProve; -use parent qw( App::Prove ); +use base qw( App::Prove ); sub new { my $class = shift; diff --git a/cpan/Test-Harness/t/proverun.t b/cpan/Test-Harness/t/proverun.t index 0cd73e7..f8aa07a 100644 --- a/cpan/Test-Harness/t/proverun.t +++ b/cpan/Test-Harness/t/proverun.t @@ -69,7 +69,7 @@ BEGIN { package FakeProve; -use parent qw( App::Prove ); +use base qw( App::Prove ); sub new { my $class = shift; diff --git a/cpan/Test-Harness/t/results.t b/cpan/Test-Harness/t/results.t index f772332..4987d79 100644 --- a/cpan/Test-Harness/t/results.t +++ b/cpan/Test-Harness/t/results.t @@ -65,7 +65,7 @@ can_ok $factory, 'register_type'; use strict; use warnings; our $VERSION; - use parent 'TAP::Parser::Result'; + use base 'TAP::Parser::Result'; TAP::Parser::ResultFactory->register_type( 'my_type' => __PACKAGE__ ); } diff --git a/cpan/Test-Harness/t/source_handler.t b/cpan/Test-Harness/t/source_handler.t index c06b342..dcc856c 100644 --- a/cpan/Test-Harness/t/source_handler.t +++ b/cpan/Test-Harness/t/source_handler.t @@ -9,6 +9,7 @@ use warnings; use Test::More tests => 79; +use Config; use IO::File; use IO::Handle; use File::Spec; @@ -87,6 +88,7 @@ my %file = map { $_ => File::Spec->catfile( $dir, $_ ) } { name => "valid executable", raw => [ $perl, ( $ENV{PERL_CORE} ? '-I../../lib' : () ), + (map { "-I$_" } split /$Config{path_sep}/, $ENV{PERL5LIB} || ''), '-It/lib', '-T', $file{source} ], iclass => 'TAP::Parser::Iterator::Process', diff --git a/cpan/Test-Harness/t/testargs.t b/cpan/Test-Harness/t/testargs.t index 3e85003..c3d8eb3 100644 --- a/cpan/Test-Harness/t/testargs.t +++ b/cpan/Test-Harness/t/testargs.t @@ -82,7 +82,7 @@ sub make_shell_test { package Test::Prove; -use parent 'App::Prove'; +use base 'App::Prove'; sub _runtests { my $self = shift;