Change 33008 by [EMAIL PROTECTED] on 2008/01/18 22:13:06
Integrate:
[ 30373]
Fix VMS exit handling broken in Test::Harness 2.64. Also
submitted as http://rt.cpan.org/Public/Bug/Display.html?id=24985
on CPAN RT queue.
[ 31717]
Subject: Harness prove-switches.t for fixed bug 30952
From: Reini Urban <[EMAIL PROTECTED]>
Date: Tue, 14 Aug 2007 22:49:32 +0200
Message-Id: <[EMAIL PROTECTED]>
[ 31764]
Subject: Re: [patch] First batch of whitespace patches (Test::Harness)
From: Max Maischein <[EMAIL PROTECTED]>
Date: Fri, 24 Aug 2007 22:04:56 +0200
Message-ID: <[EMAIL PROTECTED]>
[ 33007]
Bump $Test::Harness::Results::VERSION to '0.01_01'
Affected files ...
... //depot/maint-5.8/perl/lib/Test/Harness/Results.pm#2 integrate
... //depot/maint-5.8/perl/lib/Test/Harness/Straps.pm#18 integrate
... //depot/maint-5.8/perl/lib/Test/Harness/t/prove-switches.t#7 integrate
Differences ...
==== //depot/maint-5.8/perl/lib/Test/Harness/Results.pm#2 (text) ====
Index: perl/lib/Test/Harness/Results.pm
--- perl/lib/Test/Harness/Results.pm#1~30055~ 2007-01-28 15:54:52.000000000
-0800
+++ perl/lib/Test/Harness/Results.pm 2008-01-18 14:13:06.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.01';
+$VERSION = '0.01_01';
=head1 NAME
@@ -118,7 +118,18 @@
return $self->{ok} || 0;
}
-sub set_exit { my $self = shift; $self->{exit} = shift }
+sub set_exit {
+ my $self = shift;
+ if ($^O eq 'VMS') {
+ eval {
+ use vmsish q(status);
+ $self->{exit} = shift; # must be in same scope as pragma
+ }
+ }
+ else {
+ $self->{exit} = shift;
+ }
+}
sub exit {
my $self = shift;
return $self->{exit} || 0;
==== //depot/maint-5.8/perl/lib/Test/Harness/Straps.pm#18 (text) ====
Index: perl/lib/Test/Harness/Straps.pm
--- perl/lib/Test/Harness/Straps.pm#17~30055~ 2007-01-28 15:54:52.000000000
-0800
+++ perl/lib/Test/Harness/Straps.pm 2008-01-18 14:13:06.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.26';
+$VERSION = '0.26_01';
use Config;
use Test::Harness::Assert;
@@ -296,7 +296,7 @@
$results->set_wait($?);
if ( $? && $self->{_is_vms} ) {
- eval q{use vmsish "status"; $results->set_exit($?); };
+ $results->set_exit($?);
}
else {
$results->set_exit( _wait2exit($?) );
@@ -355,7 +355,8 @@
my $self = shift;
return $ENV{HARNESS_PERL} if defined $ENV{HARNESS_PERL};
- return qq["$^X"] if $self->{_is_win32} && ($^X =~
/[^\w\.\/\\]/);
+ #return qq["$^X"] if $self->{_is_win32} && ($^X =~
/[^\w\.\/\\]/);
+ return qq["$^X"] if $^X =~ /\s/ and $^X !~ /^["']/;
return $^X;
}
==== //depot/maint-5.8/perl/lib/Test/Harness/t/prove-switches.t#7 (text) ====
Index: perl/lib/Test/Harness/t/prove-switches.t
--- perl/lib/Test/Harness/t/prove-switches.t#6~30055~ 2007-01-28
15:54:52.000000000 -0800
+++ perl/lib/Test/Harness/t/prove-switches.t 2008-01-18 14:13:06.000000000
-0800
@@ -14,10 +14,6 @@
plan skip_all => "Not adapted to perl core" if $ENV{PERL_CORE};
plan skip_all => "Not installing prove" if -e "t/SKIP-PROVE";
-# Work around a Cygwin bug. Remove this if Perl bug 30952 ever gets fixed.
-# http://rt.perl.org/rt3/Ticket/Display.html?id=30952.
-plan skip_all => "Skipping because of a Cygwin bug" if ( $^O =~ /cygwin/i );
-
plan tests => 8;
my $blib = File::Spec->catfile( File::Spec->curdir, "blib" );
End of Patch.
