diff options
author | Karl Berry <karl@freefriends.org> | 2019-03-10 21:56:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-03-10 21:56:14 +0000 |
commit | e0a2a718e89f9700d627f1e6a8eea8f21d2fbeb8 (patch) | |
tree | 39972f65008b0d70f306a5f976494d29411bc41e /Master/tlpkg/tlperl/lib/TAP | |
parent | b206fdc77d81ed1600949062f08de5690a4bf66f (diff) |
tl19 perl 5.28.1 for Windows, from Siep
git-svn-id: svn://tug.org/texlive/trunk@50322 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlperl/lib/TAP')
43 files changed, 132 insertions, 151 deletions
diff --git a/Master/tlpkg/tlperl/lib/TAP/Base.pm b/Master/tlpkg/tlperl/lib/TAP/Base.pm index 74b6a6b2b91..78e07ab0547 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Base.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Base.pm @@ -12,11 +12,11 @@ and L<TAP::Harness> =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; use constant GOT_TIME_HIRES => do { eval 'use Time::HiRes qw(time);'; diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Base.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Base.pm index d2d35216457..bf65e12ca15 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Base.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Base.pm @@ -58,11 +58,11 @@ TAP::Formatter::Base - Base class for harness output delegates =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Color.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Color.pm index fecc40a2840..79807901012 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Color.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Color.pm @@ -12,56 +12,24 @@ my $NO_COLOR; BEGIN { $NO_COLOR = 0; + eval 'require Term::ANSIColor'; + if ($@) { + $NO_COLOR = $@; + }; if (IS_WIN32) { - eval 'use Win32::Console'; + eval 'use Win32::Console::ANSI'; if ($@) { $NO_COLOR = $@; } - else { - my $console = Win32::Console->new( STD_OUTPUT_HANDLE() ); - - # eval here because we might not know about these variables - my $fg = eval '$FG_LIGHTGRAY'; - my $bg = eval '$BG_BLACK'; - - *set_color = sub { - my ( $self, $output, $color ) = @_; - - my $var; - if ( $color eq 'reset' ) { - $fg = eval '$FG_LIGHTGRAY'; - $bg = eval '$BG_BLACK'; - } - elsif ( $color =~ /^on_(.+)$/ ) { - $bg = eval '$BG_' . uc($1); - } - else { - $fg = eval '$FG_' . uc($color); - } - - # In case of colors that aren't defined - $self->set_color('reset') - unless defined $bg && defined $fg; - - $console->Attr( $bg | $fg ); - }; - } - } - else { - eval 'use Term::ANSIColor'; - if ($@) { - $NO_COLOR = $@; - } - else { - *set_color = sub { - my ( $self, $output, $color ) = @_; - $output->( color($color) ); - }; - } - } + }; if ($NO_COLOR) { *set_color = sub { }; + } else { + *set_color = sub { + my ( $self, $output, $color ) = @_; + $output->( Term::ANSIColor::color($color) ); + }; } } @@ -71,11 +39,11 @@ TAP::Formatter::Color - Run Perl test scripts with color =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION @@ -87,7 +55,7 @@ in color. Passing tests are printed in green. Failing tests are in red. Skipped tests are blue on a white background and TODO tests are printed in white. -If L<Term::ANSIColor> cannot be found (or L<Win32::Console> if running +If L<Term::ANSIColor> cannot be found (and L<Win32::Console::ANSI> if running under Windows) tests will be run without color. =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console.pm index bafc14401c9..1c82ef43c6c 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console.pm @@ -11,11 +11,11 @@ TAP::Formatter::Console - Harness output delegate for default console output =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/ParallelSession.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/ParallelSession.pm index 8b47f49fb72..6826b4e379f 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/ParallelSession.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/ParallelSession.pm @@ -41,11 +41,11 @@ TAP::Formatter::Console::ParallelSession - Harness output delegate for parallel =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/Session.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/Session.pm index f1b0bbcfaf2..492bdd7b081 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/Session.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/Session.pm @@ -26,11 +26,11 @@ TAP::Formatter::Console::Session - Harness output delegate for default console o =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/File.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/File.pm index 02b64da1b43..ced7b3f85ea 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Formatter/File.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/File.pm @@ -13,11 +13,11 @@ TAP::Formatter::File - Harness output delegate for file output =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/File/Session.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/File/Session.pm index c4851f6a828..3403540e40b 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Formatter/File/Session.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/File/Session.pm @@ -10,11 +10,11 @@ TAP::Formatter::File::Session - Harness output delegate for file output =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Session.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Session.pm index 3416775c2f3..2022220aaaf 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Session.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Session.pm @@ -23,11 +23,11 @@ TAP::Formatter::Session - Abstract base class for harness output delegate =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 METHODS diff --git a/Master/tlpkg/tlperl/lib/TAP/Harness.pm b/Master/tlpkg/tlperl/lib/TAP/Harness.pm index e65b9b175e6..a2f6daf1dbd 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Harness.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Harness.pm @@ -16,11 +16,11 @@ TAP::Harness - Run test scripts with statistics =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; $ENV{HARNESS_ACTIVE} = 1; $ENV{HARNESS_VERSION} = $VERSION; diff --git a/Master/tlpkg/tlperl/lib/TAP/Harness/Env.pm b/Master/tlpkg/tlperl/lib/TAP/Harness/Env.pm index 842d9d79611..077626df2de 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Harness/Env.pm +++ b/Master/tlpkg/tlperl/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.38'; +our $VERSION = '3.42'; # 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.38 +Version 3.42 =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Object.pm b/Master/tlpkg/tlperl/lib/TAP/Object.pm index c500c4efaef..e9da17f4ff1 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Object.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Object.pm @@ -9,11 +9,11 @@ TAP::Object - Base class that provides common functionality to all C<TAP::*> mod =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser.pm b/Master/tlpkg/tlperl/lib/TAP/Parser.pm index 8c127743482..34f411048e3 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser.pm @@ -27,11 +27,11 @@ TAP::Parser - Parse L<TAP|Test::Harness::TAP> output =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; my $DEFAULT_TAP_VERSION = 12; my $MAX_TAP_VERSION = 13; diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Aggregator.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Aggregator.pm index ccf7b1ca809..65be445f308 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Aggregator.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Aggregator.pm @@ -12,11 +12,11 @@ TAP::Parser::Aggregator - Aggregate TAP::Parser results =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Grammar.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Grammar.pm index 3add11d1514..ff0f2aa2ad7 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Grammar.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Grammar.pm @@ -14,11 +14,11 @@ TAP::Parser::Grammar - A grammar for the Test Anything Protocol. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS @@ -178,7 +178,7 @@ my %language_for; my %v13 = ( %v12, plan => { - syntax => qr/^1\.\.(\d+)(?:\s*#\s*SKIP\b(.*))?\z/i, + syntax => qr/^1\.\.(\d+)\s*(?:\s*#\s*SKIP\b(.*))?\z/i, handler => sub { my ( $self, $line ) = @_; my ( $tests_planned, $explanation ) = ( $1, $2 ); diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator.pm index 591cf466607..fab48cb2bed 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator.pm @@ -11,11 +11,11 @@ TAP::Parser::Iterator - Base class for TAP source iterators =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Array.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Array.pm index 0cef55fcfe5..5a098cca7c0 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Array.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Array.pm @@ -11,11 +11,11 @@ TAP::Parser::Iterator::Array - Iterator for array-based TAP sources =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Process.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Process.pm index f9126b39840..a121485aec4 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Process.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Process.pm @@ -16,11 +16,11 @@ TAP::Parser::Iterator::Process - Iterator for process-based TAP sources =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Stream.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Stream.pm index a10e5937a44..2a21485357f 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Stream.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Stream.pm @@ -11,11 +11,11 @@ TAP::Parser::Iterator::Stream - Iterator for filehandle-based TAP sources =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS @@ -90,6 +90,16 @@ sub _finish { close delete $self->{fh}; } +sub get_select_handles { + my $self = shift; + + # return our handle in case it's a socket or pipe (select()-able) + return ( $self->{fh}, ) + if (-S $self->{fh} || -p $self->{fh}); + + return; +} + 1; =head1 ATTRIBUTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/IteratorFactory.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/IteratorFactory.pm index f2fe33e25a9..cd677028bd8 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/IteratorFactory.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/IteratorFactory.pm @@ -16,11 +16,11 @@ TAP::Parser::IteratorFactory - Figures out which SourceHandler objects to use fo =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS @@ -243,19 +243,14 @@ sub detect_source { confess('no raw source ref defined!') unless defined $source->raw; # find a list of handlers that can handle this source: - my %handlers; - for my $dclass ( @{ $self->handlers } ) { - my $confidence = $dclass->can_handle($source); - - # warn "handler: $dclass: $confidence\n"; - $handlers{$dclass} = $confidence if $confidence; + my %confidence_for; + for my $handler ( @{ $self->handlers } ) { + my $confidence = $handler->can_handle($source); + # warn "handler: $handler: $confidence\n"; + $confidence_for{$handler} = $confidence if $confidence; } - if ( !%handlers ) { - - # use Data::Dump qw( pp ); - # warn pp( $meta ); - + if ( !%confidence_for ) { # error: can't detect source my $raw_source_short = substr( ${ $source->raw }, 0, 50 ); confess("Cannot detect source of '$raw_source_short'!"); @@ -263,23 +258,30 @@ sub detect_source { } # if multiple handlers can handle it, choose the most confident one - my @handlers = ( - map {$_} - sort { $handlers{$a} cmp $handlers{$b} } - keys %handlers - ); + my @handlers = + sort { $confidence_for{$b} <=> $confidence_for{$a} } + keys %confidence_for; + + # Check for a tie. + if( @handlers > 1 && + $confidence_for{$handlers[0]} == $confidence_for{$handlers[1]} + ) { + my $filename = $source->meta->{file}{basename}; + die("There is a tie between $handlers[0] and $handlers[1].\n". + "Both voted $confidence_for{$handlers[0]} on $filename.\n"); + } # this is really useful for debugging handlers: if ( $ENV{TAP_HARNESS_SOURCE_FACTORY_VOTES} ) { warn( "votes: ", - join( ', ', map {"$_: $handlers{$_}"} @handlers ), + join( ', ', map {"$_: $confidence_for{$_}"} @handlers ), "\n" ); } # return 1st - return pop @handlers; + return $handlers[0]; } 1; diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Multiplexer.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Multiplexer.pm index 86298c7b119..16af2d30854 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Multiplexer.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Multiplexer.pm @@ -17,11 +17,11 @@ TAP::Parser::Multiplexer - Multiplex multiple TAP::Parsers =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result.pm index 4ec808deb0a..c8927968dbe 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result.pm @@ -24,11 +24,11 @@ TAP::Parser::Result - Base class for TAP::Parser output objects =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Bailout.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Bailout.pm index fb0684fabfe..facae6fe8e4 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Bailout.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Bailout.pm @@ -11,11 +11,11 @@ TAP::Parser::Result::Bailout - Bailout result token. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Comment.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Comment.pm index 8ffe79a73a2..0f99b57b08e 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Comment.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Comment.pm @@ -11,11 +11,11 @@ TAP::Parser::Result::Comment - Comment result token. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Plan.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Plan.pm index fb94d62047a..9db060e90df 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Plan.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Plan.pm @@ -11,11 +11,11 @@ TAP::Parser::Result::Plan - Plan result token. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Pragma.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Pragma.pm index fdc2d540236..c7a26beeedd 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Pragma.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Pragma.pm @@ -11,11 +11,11 @@ TAP::Parser::Result::Pragma - TAP pragma token. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Test.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Test.pm index 143a936f7ca..b3bd224c16f 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Test.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Test.pm @@ -11,11 +11,11 @@ TAP::Parser::Result::Test - Test result token. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Unknown.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Unknown.pm index a476896d576..d735ed165ac 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Unknown.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Unknown.pm @@ -11,11 +11,11 @@ TAP::Parser::Result::Unknown - Unknown result token. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Version.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Version.pm index db9f40faf70..5f4cb932bd3 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Version.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Version.pm @@ -11,11 +11,11 @@ TAP::Parser::Result::Version - TAP syntax version token. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/YAML.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/YAML.pm index 3cc4fe6bfe0..a88b8da1f7e 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/YAML.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/YAML.pm @@ -11,11 +11,11 @@ TAP::Parser::Result::YAML - YAML result token. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/ResultFactory.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/ResultFactory.pm index 036006fa622..27776ea05c7 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/ResultFactory.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/ResultFactory.pm @@ -29,11 +29,11 @@ TAP::Parser::ResultFactory - Factory for creating TAP::Parser output objects =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head2 DESCRIPTION diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler.pm index a00486f97c9..e13d68e087b 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler.pm @@ -13,11 +13,11 @@ TAP::Parser::Scheduler - Schedule tests during parallel testing =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS @@ -87,7 +87,7 @@ Here are some examples: ], } - # Run some startup tests in sequence, then some parallel tests than some + # Run some startup tests in sequence, then some parallel tests then some # teardown tests in sequence. { seq => [ diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Job.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Job.pm index 4ae86fba030..b765ab27b0e 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Job.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Job.pm @@ -10,11 +10,11 @@ TAP::Parser::Scheduler::Job - A single testing job. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Spinner.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Spinner.pm index a8fb21c8c81..47bc28fc913 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Spinner.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Spinner.pm @@ -10,11 +10,11 @@ TAP::Parser::Scheduler::Spinner - A no-op job. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Source.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Source.pm index b1c09fe5f2a..5bd85e37f71 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/Source.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Source.pm @@ -14,11 +14,11 @@ TAP::Parser::Source - a TAP source & meta data about it =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler.pm index 8ed24785c37..0156b99fd68 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler.pm @@ -12,11 +12,11 @@ TAP::Parser::SourceHandler - Base class for different TAP source handlers =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Executable.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Executable.pm index 4b1f3de02f2..376e8d148d8 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Executable.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Executable.pm @@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::Executable - Stream output from an executable TAP so =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/File.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/File.pm index 49b6c236309..7e1843759e8 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/File.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/File.pm @@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::File - Stream TAP from a text file. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS @@ -71,7 +71,8 @@ sub can_handle { return 0.9 if $file->{lc_ext} eq '.tap'; if ( my $exts = $config->{extensions} ) { - return 0.9 if grep { lc($_) eq $file->{lc_ext} } @$exts; + my @exts = ref $exts eq 'ARRAY' ? @$exts : $exts; + return 0.9 if grep { lc($_) eq $file->{lc_ext} } @exts; } return 0; diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Handle.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Handle.pm index 0c74d4448c6..a0a051340f7 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Handle.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Handle.pm @@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::Handle - Stream TAP from an IO::Handle or a GLOB. =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Perl.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Perl.pm index dea39043c66..c2ea252ec2a 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Perl.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Perl.pm @@ -21,11 +21,11 @@ TAP::Parser::SourceHandler::Perl - Stream TAP from a Perl executable =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/RawTAP.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/RawTAP.pm index f6fc0675b38..2ef77118bc8 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/RawTAP.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/RawTAP.pm @@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::RawTAP - Stream output from raw TAP in a scalar/arra =head1 VERSION -Version 3.38 +Version 3.42 =cut -our $VERSION = '3.38'; +our $VERSION = '3.42'; =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Reader.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Reader.pm index 1bcaa186ad4..1a8185eb6b5 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Reader.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Reader.pm @@ -5,7 +5,7 @@ use warnings; use base 'TAP::Object'; -our $VERSION = '3.38'; +our $VERSION = '3.42'; # TODO: # Handle blessed object syntax @@ -269,7 +269,7 @@ TAP::Parser::YAMLish::Reader - Read YAMLish data from iterator =head1 VERSION -Version 3.38 +Version 3.42 =head1 SYNOPSIS diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Writer.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Writer.pm index eb0afea2c3d..904244ae110 100644 --- a/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Writer.pm +++ b/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Writer.pm @@ -5,7 +5,7 @@ use warnings; use base 'TAP::Object'; -our $VERSION = '3.38'; +our $VERSION = '3.42'; 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.38 +Version 3.42 =head1 SYNOPSIS |