r14657 - in /branches/upstream/libtest-harness-perl/current: ./ bin/ lib/App/ lib/App/Prove/ lib/TAP/ lib/TAP/Formatter/ lib/TAP/Formatter/Console/ lib/TAP/Parser/ lib/TAP/Parser/Iterator/ lib/TAP/Parser/Result/ lib/TAP/Parser/Source/ lib/TAP/Parser/YAMLish/ lib/Test/ t/
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Sun Feb 10 01:41:55 UTC 2008
Author: gregoa-guest
Date: Sun Feb 10 01:41:54 2008
New Revision: 14657
URL: http://svn.debian.org/wsvn/?sc=1&rev=14657
Log:
[svn-upgrade] Integrating new upstream version, libtest-harness-perl (3.08)
Modified:
branches/upstream/libtest-harness-perl/current/Changes
branches/upstream/libtest-harness-perl/current/META.yml
branches/upstream/libtest-harness-perl/current/bin/prove
branches/upstream/libtest-harness-perl/current/lib/App/Prove.pm
branches/upstream/libtest-harness-perl/current/lib/App/Prove/State.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Base.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Color.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console/ParallelSession.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console/Session.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Harness.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Aggregator.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Grammar.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Array.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Process.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Stream.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Multiplexer.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Bailout.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Comment.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Plan.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Test.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Unknown.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Version.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/YAML.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Source.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Source/Perl.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/YAMLish/Reader.pm
branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/YAMLish/Writer.pm
branches/upstream/libtest-harness-perl/current/lib/Test/Harness.pm
branches/upstream/libtest-harness-perl/current/t/yamlish-writer.t
Modified: branches/upstream/libtest-harness-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/Changes?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/Changes (original)
+++ branches/upstream/libtest-harness-perl/current/Changes Sun Feb 10 01:41:54 2008
@@ -1,4 +1,10 @@
Revision history for Test-Harness
+
+3.08 2008-02-08
+ - added support for 'out' option to
+ Test::Harness::execute_tests. See #32476. Thanks RENEEB.
+ - Fixed YAMLish handling of non-alphanumeric hash keys.
+ - Added --dry option to prove for 2.64 compatibility.
3.07 2008-01-13
- prove now supports HARNESS_PERL_SWITCHES.
Modified: branches/upstream/libtest-harness-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/META.yml?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/META.yml (original)
+++ branches/upstream/libtest-harness-perl/current/META.yml Sun Feb 10 01:41:54 2008
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Test-Harness
-version: 3.07
+version: 3.08
abstract: ~
license: perl
author: ~
Modified: branches/upstream/libtest-harness-perl/current/bin/prove
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/bin/prove?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/bin/prove (original)
+++ branches/upstream/libtest-harness-perl/current/bin/prove Sun Feb 10 01:41:54 2008
@@ -27,6 +27,7 @@
-s, --shuffle Run the tests in random order.
-c, --color Colored test output (default).
--nocolor Do not color test output.
+ -D --dry Dry run. Show test that would have run.
-f, --failures Only show failed tests.
--fork Fork to run harness in multiple processes
-m, --merge Merge test scripts' STDERR with their STDOUT.
Modified: branches/upstream/libtest-harness-perl/current/lib/App/Prove.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/App/Prove.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/App/Prove.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/App/Prove.pm Sun Feb 10 01:41:54 2008
@@ -15,11 +15,11 @@
=head1 VERSION
-Version 3.07
-
-=cut
-
-$VERSION = '3.07';
+Version 3.08
+
+=cut
+
+$VERSION = '3.08';
=head1 DESCRIPTION
@@ -54,7 +54,7 @@
harness includes modules plugins jobs lib merge parse quiet
really_quiet recurse backwards shuffle taint_fail taint_warn timer
verbose warnings_fail warnings_warn show_help show_man
- show_version test_args state
+ show_version test_args state dry
);
for my $attr (@ATTR) {
no strict 'refs';
@@ -192,6 +192,7 @@
'color!' => \$self->{color},
'colour!' => \$self->{color},
'c' => \$self->{color},
+ 'D|dry' => \$self->{dry},
'harness=s' => \$self->{harness},
'formatter=s' => \$self->{formatter},
'r|recurse' => \$self->{recurse},
@@ -394,26 +395,36 @@
elsif ( $self->show_version ) {
$self->print_version;
}
+ elsif ( $self->dry ) {
+ print "$_\n" for $self->_get_tests;
+ }
else {
$self->_load_extensions( $self->modules );
$self->_load_extensions( $self->plugins, PLUGINS );
- my $state = $self->{_state};
- if ( defined( my $state_switch = $self->state ) ) {
- $state->apply_switch(@$state_switch);
- }
-
- my @tests = $state->get_tests( $self->recurse, @{ $self->argv } );
-
- $self->_shuffle(@tests) if $self->shuffle;
- @tests = reverse @tests if $self->backwards;
local $ENV{TEST_VERBOSE} = 1 if $self->verbose;
- $self->_runtests( $self->_get_args, @tests );
- }
-
- return;
+ $self->_runtests( $self->_get_args, $self->_get_tests );
+ }
+
+ return;
+}
+
+sub _get_tests {
+ my $self = shift;
+
+ my $state = $self->{_state};
+ if ( defined( my $state_switch = $self->state ) ) {
+ $state->apply_switch(@$state_switch);
+ }
+
+ my @tests = $state->get_tests( $self->recurse, @{ $self->argv } );
+
+ $self->_shuffle(@tests) if $self->shuffle;
+ @tests = reverse @tests if $self->backwards;
+
+ return @tests;
}
sub _runtests {
@@ -552,6 +563,8 @@
=item C<directives>
+=item C<dry>
+
=item C<exec>
=item C<failures>
Modified: branches/upstream/libtest-harness-perl/current/lib/App/Prove/State.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/App/Prove/State.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/App/Prove/State.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/App/Prove/State.pm Sun Feb 10 01:41:54 2008
@@ -20,11 +20,11 @@
=head1 VERSION
-Version 3.07
-
-=cut
-
-$VERSION = '3.07';
+Version 3.08
+
+=cut
+
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Base.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Base.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Base.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Base.pm Sun Feb 10 01:41:54 2008
@@ -9,11 +9,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
my $GOT_TIME_HIRES;
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Color.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Color.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Color.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Color.pm Sun Feb 10 01:41:54 2008
@@ -70,11 +70,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console.pm Sun Feb 10 01:41:54 2008
@@ -52,11 +52,11 @@
=head1 VERSION
-Version 3.07
-
-=cut
-
-$VERSION = '3.07';
+Version 3.08
+
+=cut
+
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console/ParallelSession.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console/ParallelSession.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console/ParallelSession.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console/ParallelSession.pm Sun Feb 10 01:41:54 2008
@@ -48,11 +48,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console/Session.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console/Session.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console/Session.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Formatter/Console/Session.pm Sun Feb 10 01:41:54 2008
@@ -36,11 +36,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Harness.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Harness.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Harness.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Harness.pm Sun Feb 10 01:41:54 2008
@@ -22,11 +22,11 @@
=head1 VERSION
-Version 3.07
-
-=cut
-
-$VERSION = '3.07';
+Version 3.08
+
+=cut
+
+$VERSION = '3.08';
$ENV{HARNESS_ACTIVE} = 1;
$ENV{HARNESS_VERSION} = $VERSION;
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser.pm Sun Feb 10 01:41:54 2008
@@ -19,11 +19,11 @@
=head1 VERSION
-Version 3.07
-
-=cut
-
-$VERSION = '3.07';
+Version 3.08
+
+=cut
+
+$VERSION = '3.08';
my $DEFAULT_TAP_VERSION = 12;
my $MAX_TAP_VERSION = 13;
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Aggregator.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Aggregator.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Aggregator.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Aggregator.pm Sun Feb 10 01:41:54 2008
@@ -10,11 +10,11 @@
=head1 VERSION
-Version 3.07
-
-=cut
-
-$VERSION = '3.07';
+Version 3.08
+
+=cut
+
+$VERSION = '3.08';
=head1 SYNOPSIS
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Grammar.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Grammar.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Grammar.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Grammar.pm Sun Feb 10 01:41:54 2008
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
-
-=cut
-
-$VERSION = '3.07';
+Version 3.08
+
+=cut
+
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator.pm Sun Feb 10 01:41:54 2008
@@ -13,11 +13,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Array.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Array.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Array.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Array.pm Sun Feb 10 01:41:54 2008
@@ -11,11 +11,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Process.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Process.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Process.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Process.pm Sun Feb 10 01:41:54 2008
@@ -19,11 +19,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Stream.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Stream.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Stream.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Iterator/Stream.pm Sun Feb 10 01:41:54 2008
@@ -11,11 +11,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Multiplexer.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Multiplexer.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Multiplexer.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Multiplexer.pm Sun Feb 10 01:41:54 2008
@@ -14,11 +14,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result.pm Sun Feb 10 01:41:54 2008
@@ -27,11 +27,11 @@
=head1 VERSION
-Version 3.07
-
-=cut
-
-$VERSION = '3.07';
+Version 3.08
+
+=cut
+
+$VERSION = '3.08';
=head2 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Bailout.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Bailout.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Bailout.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Bailout.pm Sun Feb 10 01:41:54 2008
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Comment.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Comment.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Comment.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Comment.pm Sun Feb 10 01:41:54 2008
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Plan.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Plan.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Plan.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Plan.pm Sun Feb 10 01:41:54 2008
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Test.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Test.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Test.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Test.pm Sun Feb 10 01:41:54 2008
@@ -14,11 +14,11 @@
=head1 VERSION
-Version 3.07
-
-=cut
-
-$VERSION = '3.07';
+Version 3.08
+
+=cut
+
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Unknown.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Unknown.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Unknown.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Unknown.pm Sun Feb 10 01:41:54 2008
@@ -14,11 +14,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Version.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Version.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Version.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/Version.pm Sun Feb 10 01:41:54 2008
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/YAML.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/YAML.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/YAML.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Result/YAML.pm Sun Feb 10 01:41:54 2008
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Source.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Source.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Source.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Source.pm Sun Feb 10 01:41:54 2008
@@ -14,11 +14,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Source/Perl.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Source/Perl.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Source/Perl.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/Source/Perl.pm Sun Feb 10 01:41:54 2008
@@ -16,11 +16,11 @@
=head1 VERSION
-Version 3.07
-
-=cut
-
-$VERSION = '3.07';
+Version 3.08
+
+=cut
+
+$VERSION = '3.08';
=head1 DESCRIPTION
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/YAMLish/Reader.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/YAMLish/Reader.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/YAMLish/Reader.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/YAMLish/Reader.pm Sun Feb 10 01:41:54 2008
@@ -4,7 +4,7 @@
use vars qw{$VERSION};
-$VERSION = '3.07';
+$VERSION = '3.08';
# TODO:
# Handle blessed object syntax
@@ -277,7 +277,7 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=head1 SYNOPSIS
Modified: branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/YAMLish/Writer.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/YAMLish/Writer.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/YAMLish/Writer.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/TAP/Parser/YAMLish/Writer.pm Sun Feb 10 01:41:54 2008
@@ -4,9 +4,10 @@
use vars qw{$VERSION};
-$VERSION = '3.07';
+$VERSION = '3.08';
my $ESCAPE_CHAR = qr{ [ \x00-\x1f \" ] }x;
+my $ESCAPE_KEY = qr{ (?: ^\W ) | $ESCAPE_CHAR }x;
my @UNPRINTABLE = qw(
z x01 x02 x03 x04 x05 x06 a
@@ -71,10 +72,11 @@
sub _enc_scalar {
my $self = shift;
my $val = shift;
+ my $rule = shift;
return '~' unless defined $val;
- if ( $val =~ /$ESCAPE_CHAR/ ) {
+ if ( $val =~ /$rule/ ) {
$val =~ s/\\/\\\\/g;
$val =~ s/"/\\"/g;
$val =~ s/ ( [\x00-\x1f] ) / '\\' . $UNPRINTABLE[ ord($1) ] /gex;
@@ -103,7 +105,7 @@
for my $key ( sort keys %$obj ) {
my $value = $obj->{$key};
$self->_write_obj(
- $pad . $self->_enc_scalar($key) . ':',
+ $pad . $self->_enc_scalar( $key, $ESCAPE_KEY ) . ':',
$value, $indent + 1
);
}
@@ -131,7 +133,7 @@
}
}
else {
- $self->_put( $prefix, ' ', $self->_enc_scalar($obj) );
+ $self->_put( $prefix, ' ', $self->_enc_scalar( $obj, $ESCAPE_CHAR ) );
}
}
@@ -147,7 +149,7 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=head1 SYNOPSIS
Modified: branches/upstream/libtest-harness-perl/current/lib/Test/Harness.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/lib/Test/Harness.pm?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/lib/Test/Harness.pm (original)
+++ branches/upstream/libtest-harness-perl/current/lib/Test/Harness.pm Sun Feb 10 01:41:54 2008
@@ -41,11 +41,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
# Backwards compatibility for exportable variable names.
*verbose = *Verbose;
@@ -219,6 +219,7 @@
}
sub _new_harness {
+ my $sub_args = shift || {};
if ( defined( my $env_sw = $ENV{HARNESS_PERL_SWITCHES} ) ) {
$Switches .= ' ' . $env_sw if ( length($env_sw) );
@@ -250,6 +251,9 @@
color => $Color,
verbosity => $verbosity,
};
+
+ $args->{stdout} = $sub_args->{out}
+ if exists $sub_args->{out};
if ( defined( my $env_opt = $ENV{HARNESS_OPTIONS} ) ) {
for my $opt ( split /:/, $env_opt ) {
@@ -336,9 +340,7 @@
sub execute_tests {
my %args = @_;
- # TODO: Handle out option
-
- my $harness = _new_harness();
+ my $harness = _new_harness( \%args );
my $aggregate = TAP::Parser::Aggregator->new();
my %tot = (
Modified: branches/upstream/libtest-harness-perl/current/t/yamlish-writer.t
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-harness-perl/current/t/yamlish-writer.t?rev=14657&op=diff
==============================================================================
--- branches/upstream/libtest-harness-perl/current/t/yamlish-writer.t (original)
+++ branches/upstream/libtest-harness-perl/current/t/yamlish-writer.t Sun Feb 10 01:41:54 2008
@@ -150,6 +150,14 @@
"'': ''",
'...',
],
+ },
+ { name => 'Funky hash key',
+ in => { './frob' => 'is_frob' },
+ out => [
+ '---',
+ '"./frob": is_frob',
+ '...',
+ ]
},
{ name => 'Complex',
in => {
@@ -256,7 +264,7 @@
my $yr = TAP::Parser::YAMLish::Reader->new;
# Now try parsing it
- my $reader = sub { shift @$got };
+ my $reader = sub { shift @$got };
my $parsed = eval { $yr->read($reader) };
ok !$@, "$name: no error" or diag "$@";
More information about the Pkg-perl-cvs-commits
mailing list