Upgrade to Test::Simple 0.80, but keep locally modified More.t

p4raw-id: //depot/perl@33690

diff --git a/lib/Test/Builder.pm b/lib/Test/Builder.pm
index 1ccad4f..1a2cdb0 100644 (file)
--- a/lib/Test/Builder.pm
+++ b/lib/Test/Builder.pm
@@ -3,7 +3,7 @@ package Test::Builder;
 use 5.006;
 use strict;
 
-our $VERSION = '0.78_01';
+our $VERSION = '0.80';
 $VERSION = eval { $VERSION }; # make the alpha version come out as a number
 
 # Make Test::Builder thread-safe for ithreads.
@@ -920,11 +920,7 @@ sub maybe_regex {
     my($re, $opts);
 
     # Check for qr/foo/
-    if (   $] >= 5.009004 
-              ? re::is_regexp($regex) 
-              : ref $regex eq 'Regexp'
-       ) 
-    {
+    if( _is_qr($regex) ) {
         $usable_regex = $regex;
     }
     # Check for '/foo/' or 'm,foo,'
@@ -1400,13 +1396,13 @@ sub _open_testhandles {
 
 
 sub _copy_io_layers {
-    my($self, $src, $dest) = @_;
+    my($self, $src, $dst) = @_;
     
     $self->_try(sub {
         require PerlIO;
-        my @layers = PerlIO::get_layers($src);
-        
-        binmode $dest, join " ", map ":$_", @layers if @layers;
+        my @src_layers = PerlIO::get_layers($src);
+
+        binmode $dst, join " ", map ":$_", @src_layers if @src_layers;
     });
 }
 

diff --git a/lib/Test/Builder/Module.pm b/lib/Test/Builder/Module.pm
index 514c405..ea2f2d9 100644 (file)
--- a/lib/Test/Builder/Module.pm
+++ b/lib/Test/Builder/Module.pm
@@ -7,7 +7,7 @@ use Test::Builder;
 require Exporter;
 our @ISA = qw(Exporter);
 
-our $VERSION = '0.78';
+our $VERSION = '0.80';
 
 # 5.004's Exporter doesn't have export_to_level.
 my $_export_to_level = sub {

diff --git a/lib/Test/More.pm b/lib/Test/More.pm
index e5a0a93..5842e05 100644 (file)
--- a/lib/Test/More.pm
+++ b/lib/Test/More.pm
@@ -15,7 +15,7 @@ sub _carp {
 
 
 use vars qw($VERSION @ISA @EXPORT %EXPORT_TAGS $TODO);
-$VERSION = '0.78';
+$VERSION = '0.80';
 $VERSION = eval $VERSION;    # make the alpha version come out as a number
 
 use Test::Builder::Module;

diff --git a/lib/Test/Simple.pm b/lib/Test/Simple.pm
index 120893d..e4799ca 100644 (file)
--- a/lib/Test/Simple.pm
+++ b/lib/Test/Simple.pm
@@ -4,7 +4,7 @@ use 5.004;
 
 use strict 'vars';
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.78';
+$VERSION = '0.80';
 $VERSION = eval $VERSION;    # make the alpha version come out as a number
 
 use Test::Builder::Module;

diff --git a/lib/Test/Simple/Changes b/lib/Test/Simple/Changes
index c6dcd59..1751330 100644 (file)
--- a/lib/Test/Simple/Changes
+++ b/lib/Test/Simple/Changes
@@ -1,3 +1,72 @@
+0.80  Sun Apr  6 17:25:01 CEST 2008
+    Test fixes
+    - Completely disable the utf8 test.  It was causing perl to panic on some OS's.
+
+
+0.79_01  Wed Feb 27 03:04:54 PST 2008
+    Bug fixes
+    - Let's try the IO layer copying again, this time with the test
+      fixed for 5.10.
+
+
+0.78  Wed Feb 27 01:59:09 PST 2008
+    Bug fixes
+    * Whoops, the version of Test::Builder::Tester got moved backwards.
+
+
+0.77  Wed Feb 27 01:55:55 PST 2008
+    Bug fixes
+    - "use Test::Builder::Module" no longer sets exported_to() or does
+      any other importing.
+    - Fix the $TODO finding code so it can find $TODO without the benefit
+      of exported_to(), which is often wrong.
+    - Turn off the filehandle locale stuff for the moment, there's a 
+      problem on 5.10.  We'll try it again next release.
+      
+    Doc improvements
+    - Improve the Test::Builder SYNOPSIS to use Test::Builder::Module
+      rather than write it's own import().
+
+
+0.76_02  Sun Feb 24 13:12:55 PST 2008
+    Bug fixes
+    * The default test output filehandles will NOT use utf8.
+      They will now copy the IO layers from STDOUT and STDERR.
+      This means if :utf8 is on then it will honor it and not
+      warn about wide characters.
+
+
+0.76_01  Sat Feb 23 20:44:32 PST 2008
+    Bug fixes
+    * Test::Builder no longer uses a __DIE__ handler.  This resolves a number
+      of problems with exit codes being swallowed or other module's handlers
+      being interfered with.  [rt.cpan.org 25294]
+    - Allow maybe_regex() to detect blessed regexes.  [bleadperl @32880]
+    - The default test output filehandles will now use utf8.
+      [rt.cpan.org 21091]
+
+    Test fixes
+    - Remove the signature test.  Adds no security and just generates
+      failures.
+
+
+0.75  Sat Feb 23 19:03:38 PST 2008
+    Incompatibilities
+    * The minimum version is now 5.6.0.
+
+    Bug fixes
+    - Turns out require_ok() had the same bug as use_ok() in a BEGIN block.
+    - ok() was not honoring exported_to() when looking for $TODO as it
+      should be.
+    
+    Test fixes
+    * is_deeply_with_threads.t will not run unless AUTHOR_TESTING is set.
+      This is because it tickles intermittent threading bugs in many perls
+      and causes a lot of bug reports about which I can do nothing.
+    
+    Misc
+    - Ran through perlcritic and did some cleaning.
+
 0.74  Thu Nov 29 15:39:57 PST 2007
     Misc
     - Add abstract and author to the meta information.

diff --git a/lib/Test/Simple/t/utf8.t b/lib/Test/Simple/t/utf8.t
index 7640db6..c7e93c3 100644 (file)
--- a/lib/Test/Simple/t/utf8.t
+++ b/lib/Test/Simple/t/utf8.t
@@ -10,6 +10,7 @@ BEGIN {
 use strict;
 use warnings;
 
+use Test::More skip_all => 'Not yet implemented';
 
 my $have_perlio;
 BEGIN {
@@ -21,8 +22,15 @@ BEGIN {
         1;
     ];
 }
-#use Test::More tests => 5;
-use Test::More skip_all => 'Not yet implemented';
+
+use Test::More;
+
+if( !$have_perlio ) {
+    plan skip_all => "Don't have PerlIO";
+}
+else {
+    plan tests => 5;
+}
 
 SKIP: {
     skip( "Need PerlIO for this feature", 3 )
@@ -39,8 +47,8 @@ SKIP: {
         
         my $dest = Test::More->builder->$method;
         
-        is_deeply [PerlIO::get_layers($dest)],
-                  [PerlIO::get_layers($src)],
+        is_deeply { map { $_ => 1 } PerlIO::get_layers($dest) },
+                  { map { $_ => 1 } PerlIO::get_layers($src)  },
                   "layers copied to $method";
     }
 }
@@ -58,4 +66,4 @@ SKIP: {
 
     is( $uni, $uni, "Testing $uni" );
     is_deeply( \@warnings, [] );
-}
\ No newline at end of file
+}