Change 33965 by [EMAIL PROTECTED] on 2008/05/31 14:41:55
Integrate:
[ 33264]
Upgrade to Test-Harness-3.08
Affected files ...
... //depot/maint-5.10/perl/lib/App/Prove.pm#4 integrate
... //depot/maint-5.10/perl/lib/App/Prove/State.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Base.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Formatter/Color.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Formatter/Console.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Formatter/Console/ParallelSession.pm#4
integrate
... //depot/maint-5.10/perl/lib/TAP/Formatter/Console/Session.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Harness.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Aggregator.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Grammar.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Iterator.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Iterator/Array.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Iterator/Process.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Iterator/Stream.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Multiplexer.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Result.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Result/Bailout.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Result/Comment.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Result/Plan.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Result/Test.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Result/Unknown.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Result/Version.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Result/YAML.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Source.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/Source/Perl.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/YAMLish/Reader.pm#4 integrate
... //depot/maint-5.10/perl/lib/TAP/Parser/YAMLish/Writer.pm#4 integrate
... //depot/maint-5.10/perl/lib/Test/Harness.pm#5 integrate
... //depot/maint-5.10/perl/lib/Test/Harness/bin/prove#4 integrate
... //depot/maint-5.10/perl/lib/Test/Harness/t/yamlish-writer.t#2 integrate
Differences ...
==== //depot/maint-5.10/perl/lib/App/Prove.pm#4 (text) ====
Index: perl/lib/App/Prove.pm
--- perl/lib/App/Prove.pm#3~33964~ 2008-05-31 07:39:50.000000000 -0700
+++ perl/lib/App/Prove.pm 2008-05-31 07:41:55.000000000 -0700
@@ -15,11 +15,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$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,28 +395,38 @@
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 );
+ $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 {
my ( $self, $args, $harness_class, @tests ) = @_;
my $harness = $harness_class->new($args);
@@ -552,6 +563,8 @@
=item C<directives>
+=item C<dry>
+
=item C<exec>
=item C<failures>
==== //depot/maint-5.10/perl/lib/App/Prove/State.pm#4 (text) ====
Index: perl/lib/App/Prove/State.pm
--- perl/lib/App/Prove/State.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/App/Prove/State.pm 2008-05-31 07:41:55.000000000 -0700
@@ -20,11 +20,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Base.pm#4 (text) ====
Index: perl/lib/TAP/Base.pm
--- perl/lib/TAP/Base.pm#3~33964~ 2008-05-31 07:39:50.000000000 -0700
+++ perl/lib/TAP/Base.pm 2008-05-31 07:41:55.000000000 -0700
@@ -9,11 +9,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
my $GOT_TIME_HIRES;
==== //depot/maint-5.10/perl/lib/TAP/Formatter/Color.pm#4 (text) ====
Index: perl/lib/TAP/Formatter/Color.pm
--- perl/lib/TAP/Formatter/Color.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Formatter/Color.pm 2008-05-31 07:41:55.000000000 -0700
@@ -70,11 +70,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Formatter/Console.pm#4 (text) ====
Index: perl/lib/TAP/Formatter/Console.pm
--- perl/lib/TAP/Formatter/Console.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Formatter/Console.pm 2008-05-31 07:41:55.000000000 -0700
@@ -52,11 +52,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Formatter/Console/ParallelSession.pm#4
(text) ====
Index: perl/lib/TAP/Formatter/Console/ParallelSession.pm
--- perl/lib/TAP/Formatter/Console/ParallelSession.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Formatter/Console/ParallelSession.pm 2008-05-31
07:41:55.000000000 -0700
@@ -48,11 +48,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Formatter/Console/Session.pm#4 (text) ====
Index: perl/lib/TAP/Formatter/Console/Session.pm
--- perl/lib/TAP/Formatter/Console/Session.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Formatter/Console/Session.pm 2008-05-31 07:41:55.000000000
-0700
@@ -36,11 +36,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Harness.pm#4 (text) ====
Index: perl/lib/TAP/Harness.pm
--- perl/lib/TAP/Harness.pm#3~33964~ 2008-05-31 07:39:50.000000000 -0700
+++ perl/lib/TAP/Harness.pm 2008-05-31 07:41:55.000000000 -0700
@@ -22,11 +22,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
$ENV{HARNESS_ACTIVE} = 1;
$ENV{HARNESS_VERSION} = $VERSION;
==== //depot/maint-5.10/perl/lib/TAP/Parser.pm#4 (text) ====
Index: perl/lib/TAP/Parser.pm
--- perl/lib/TAP/Parser.pm#3~33964~ 2008-05-31 07:39:50.000000000 -0700
+++ perl/lib/TAP/Parser.pm 2008-05-31 07:41:55.000000000 -0700
@@ -19,11 +19,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
my $DEFAULT_TAP_VERSION = 12;
my $MAX_TAP_VERSION = 13;
==== //depot/maint-5.10/perl/lib/TAP/Parser/Aggregator.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Aggregator.pm
--- perl/lib/TAP/Parser/Aggregator.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Parser/Aggregator.pm 2008-05-31 07:41:55.000000000 -0700
@@ -10,11 +10,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
==== //depot/maint-5.10/perl/lib/TAP/Parser/Grammar.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Grammar.pm
--- perl/lib/TAP/Parser/Grammar.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Parser/Grammar.pm 2008-05-31 07:41:55.000000000 -0700
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/Iterator.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Iterator.pm
--- perl/lib/TAP/Parser/Iterator.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Parser/Iterator.pm 2008-05-31 07:41:55.000000000 -0700
@@ -13,11 +13,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
==== //depot/maint-5.10/perl/lib/TAP/Parser/Iterator/Array.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Iterator/Array.pm
--- perl/lib/TAP/Parser/Iterator/Array.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Parser/Iterator/Array.pm 2008-05-31 07:41:55.000000000
-0700
@@ -11,11 +11,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
==== //depot/maint-5.10/perl/lib/TAP/Parser/Iterator/Process.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Iterator/Process.pm
--- perl/lib/TAP/Parser/Iterator/Process.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Parser/Iterator/Process.pm 2008-05-31 07:41:55.000000000
-0700
@@ -19,11 +19,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
==== //depot/maint-5.10/perl/lib/TAP/Parser/Iterator/Stream.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Iterator/Stream.pm
--- perl/lib/TAP/Parser/Iterator/Stream.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Parser/Iterator/Stream.pm 2008-05-31 07:41:55.000000000
-0700
@@ -11,11 +11,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
==== //depot/maint-5.10/perl/lib/TAP/Parser/Multiplexer.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Multiplexer.pm
--- perl/lib/TAP/Parser/Multiplexer.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Parser/Multiplexer.pm 2008-05-31 07:41:55.000000000 -0700
@@ -14,11 +14,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 SYNOPSIS
==== //depot/maint-5.10/perl/lib/TAP/Parser/Result.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Result.pm
--- perl/lib/TAP/Parser/Result.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Parser/Result.pm 2008-05-31 07:41:55.000000000 -0700
@@ -27,11 +27,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head2 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/Result/Bailout.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Result/Bailout.pm
--- perl/lib/TAP/Parser/Result/Bailout.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Parser/Result/Bailout.pm 2008-05-31 07:41:55.000000000
-0700
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/Result/Comment.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Result/Comment.pm
--- perl/lib/TAP/Parser/Result/Comment.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Parser/Result/Comment.pm 2008-05-31 07:41:55.000000000
-0700
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/Result/Plan.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Result/Plan.pm
--- perl/lib/TAP/Parser/Result/Plan.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Parser/Result/Plan.pm 2008-05-31 07:41:55.000000000 -0700
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/Result/Test.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Result/Test.pm
--- perl/lib/TAP/Parser/Result/Test.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Parser/Result/Test.pm 2008-05-31 07:41:55.000000000 -0700
@@ -14,11 +14,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/Result/Unknown.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Result/Unknown.pm
--- perl/lib/TAP/Parser/Result/Unknown.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Parser/Result/Unknown.pm 2008-05-31 07:41:55.000000000
-0700
@@ -14,11 +14,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/Result/Version.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Result/Version.pm
--- perl/lib/TAP/Parser/Result/Version.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Parser/Result/Version.pm 2008-05-31 07:41:55.000000000
-0700
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/Result/YAML.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Result/YAML.pm
--- perl/lib/TAP/Parser/Result/YAML.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Parser/Result/YAML.pm 2008-05-31 07:41:55.000000000 -0700
@@ -12,11 +12,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/Source.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Source.pm
--- perl/lib/TAP/Parser/Source.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Parser/Source.pm 2008-05-31 07:41:55.000000000 -0700
@@ -14,11 +14,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/Source/Perl.pm#4 (text) ====
Index: perl/lib/TAP/Parser/Source/Perl.pm
--- perl/lib/TAP/Parser/Source/Perl.pm#3~33964~ 2008-05-31 07:39:50.000000000
-0700
+++ perl/lib/TAP/Parser/Source/Perl.pm 2008-05-31 07:41:55.000000000 -0700
@@ -16,11 +16,11 @@
=head1 VERSION
-Version 3.07
+Version 3.08
=cut
-$VERSION = '3.07';
+$VERSION = '3.08';
=head1 DESCRIPTION
==== //depot/maint-5.10/perl/lib/TAP/Parser/YAMLish/Reader.pm#4 (text) ====
Index: perl/lib/TAP/Parser/YAMLish/Reader.pm
--- perl/lib/TAP/Parser/YAMLish/Reader.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Parser/YAMLish/Reader.pm 2008-05-31 07:41:55.000000000
-0700
@@ -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
==== //depot/maint-5.10/perl/lib/TAP/Parser/YAMLish/Writer.pm#4 (text) ====
Index: perl/lib/TAP/Parser/YAMLish/Writer.pm
--- perl/lib/TAP/Parser/YAMLish/Writer.pm#3~33964~ 2008-05-31
07:39:50.000000000 -0700
+++ perl/lib/TAP/Parser/YAMLish/Writer.pm 2008-05-31 07:41:55.000000000
-0700
@@ -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
==== //depot/maint-5.10/perl/lib/Test/Harness.pm#5 (text) ====
Index: perl/lib/Test/Harness.pm
--- perl/lib/Test/Harness.pm#4~33964~ 2008-05-31 07:39:50.000000000 -0700
+++ perl/lib/Test/Harness.pm 2008-05-31 07:41:55.000000000 -0700
@@ -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) );
@@ -251,6 +252,9 @@
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 ) {
if ( $opt =~ /^j(\d*)$/ ) {
@@ -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 = (
==== //depot/maint-5.10/perl/lib/Test/Harness/bin/prove#4 (text) ====
Index: perl/lib/Test/Harness/bin/prove
--- perl/lib/Test/Harness/bin/prove#3~33963~ 2008-05-31 07:37:05.000000000
-0700
+++ perl/lib/Test/Harness/bin/prove 2008-05-31 07:41:55.000000000 -0700
@@ -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.
==== //depot/maint-5.10/perl/lib/Test/Harness/t/yamlish-writer.t#2 (text) ====
Index: perl/lib/Test/Harness/t/yamlish-writer.t
--- perl/lib/Test/Harness/t/yamlish-writer.t#1~33961~ 2008-05-31
07:30:09.000000000 -0700
+++ perl/lib/Test/Harness/t/yamlish-writer.t 2008-05-31 07:41:55.000000000
-0700
@@ -151,6 +151,14 @@
'...',
],
},
+ { name => 'Funky hash key',
+ in => { './frob' => 'is_frob' },
+ out => [
+ '---',
+ '"./frob": is_frob',
+ '...',
+ ]
+ },
{ name => 'Complex',
in => {
'bill-to' => {
@@ -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 "$@";
End of Patch.
