Change 33970 by [EMAIL PROTECTED] on 2008/05/31 16:19:43 Integrate: [ 33690] Upgrade to Test::Simple 0.80, but keep locally modified More.t [ 33691] Add Dummy.pm from the base CPAN distribution, and adjust tests accordingly [ 33692] Move the NoExporter test module under Test::Simple (part of a plan to have modules self contained, and removing test modules from t/lib)
Affected files ... ... //depot/maint-5.10/perl/MANIFEST#37 integrate ... //depot/maint-5.10/perl/lib/Test/Builder.pm#5 integrate ... //depot/maint-5.10/perl/lib/Test/Builder/Module.pm#4 integrate ... //depot/maint-5.10/perl/lib/Test/More.pm#4 integrate ... //depot/maint-5.10/perl/lib/Test/Simple.pm#4 integrate ... //depot/maint-5.10/perl/lib/Test/Simple/Changes#3 integrate ... //depot/maint-5.10/perl/lib/Test/Simple/t/lib/NoExporter.pm#1 branch ... //depot/maint-5.10/perl/lib/Test/Simple/t/use_ok.t#2 integrate ... //depot/maint-5.10/perl/lib/Test/Simple/t/utf8.t#2 integrate ... //depot/maint-5.10/perl/lib/base/t/lib/Dummy.pm#1 branch ... //depot/maint-5.10/perl/lib/base/t/version.t#2 integrate ... //depot/maint-5.10/perl/t/lib/NoExporter.pm#2 delete Differences ... ==== //depot/maint-5.10/perl/MANIFEST#37 (text) ==== Index: perl/MANIFEST --- perl/MANIFEST#36~33969~ 2008-05-31 08:46:38.000000000 -0700 +++ perl/MANIFEST 2008-05-31 09:19:43.000000000 -0700 @@ -1484,6 +1484,7 @@ lib/base/t/fields-base.t See if fields work lib/base/t/fields.t See if fields work lib/base/t/isa.t See if base's behaviour doesn't change +lib/base/t/lib/Dummy.pm Test module for base.pm lib/base/t/sigdie.t See if base works with SIGDIE lib/base/t/version.t See if base works with versions lib/base/t/warnings.t See if base works with warnings @@ -2754,7 +2755,8 @@ lib/Test/Simple/t/is_deeply_with_threads.t Test::More test lib/Test/Simple/t/is_fh.t Test::Builder test, _is_fh() lib/Test/Simple/t/lib/Dummy.pm Test::More test module -lib/Test/Simple/t/lib/MyOverload.pm Test::More test module +lib/Test/Simple/t/lib/MyOverload.pm Test::More test module +lib/Test/Simple/t/lib/NoExporter.pm Test::Simple test module lib/Test/Simple/t/maybe_regex.t Test::Builder->maybe_regex() tests lib/Test/Simple/t/missing.t Test::Simple test, missing tests lib/Test/Simple/t/More.t Test::More test, basic stuff @@ -3590,7 +3592,6 @@ t/lib/dprof/test8_t Perl code profiler tests t/lib/dprof/test8_v Perl code profiler tests t/lib/dprof/V.pm Perl code profiler tests -t/lib/Dummy.pm Module for testing base.pm t/lib/feature/bundle Tests for feature bundles t/lib/feature/implicit Tests for implicit loading of feature.pm t/lib/feature/nonesuch Tests for enabling/disabling nonexistent feature @@ -3620,7 +3621,6 @@ t/lib/Math/BigRat/Test.pm Math::BigRat test helper t/lib/mypragma.pm An example user pragma t/lib/mypragma.t Test the example user pragma -t/lib/NoExporter.pm Part of Test-Simple t/lib/NoFork.pm Module for testing Test::Harness t/lib/no_load.t Test that some modules don't load others t/lib/proxy_constant_subs.t Test that Proxy Constant Subs behave correctly ==== //depot/maint-5.10/perl/lib/Test/Builder.pm#5 (text) ==== Index: perl/lib/Test/Builder.pm --- perl/lib/Test/Builder.pm#4~33969~ 2008-05-31 08:46:38.000000000 -0700 +++ perl/lib/Test/Builder.pm 2008-05-31 09:19:43.000000000 -0700 @@ -3,7 +3,7 @@ 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 @@ 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 _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; }); } ==== //depot/maint-5.10/perl/lib/Test/Builder/Module.pm#4 (text) ==== Index: perl/lib/Test/Builder/Module.pm --- perl/lib/Test/Builder/Module.pm#3~33969~ 2008-05-31 08:46:38.000000000 -0700 +++ perl/lib/Test/Builder/Module.pm 2008-05-31 09:19:43.000000000 -0700 @@ -7,7 +7,7 @@ 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 { ==== //depot/maint-5.10/perl/lib/Test/More.pm#4 (text) ==== Index: perl/lib/Test/More.pm --- perl/lib/Test/More.pm#3~33969~ 2008-05-31 08:46:38.000000000 -0700 +++ perl/lib/Test/More.pm 2008-05-31 09:19:43.000000000 -0700 @@ -15,7 +15,7 @@ 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; ==== //depot/maint-5.10/perl/lib/Test/Simple.pm#4 (text) ==== Index: perl/lib/Test/Simple.pm --- perl/lib/Test/Simple.pm#3~33969~ 2008-05-31 08:46:38.000000000 -0700 +++ perl/lib/Test/Simple.pm 2008-05-31 09:19:43.000000000 -0700 @@ -4,7 +4,7 @@ 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; ==== //depot/maint-5.10/perl/lib/Test/Simple/Changes#3 (text) ==== Index: perl/lib/Test/Simple/Changes --- perl/lib/Test/Simple/Changes#2~33108~ 2008-01-29 09:37:50.000000000 -0800 +++ perl/lib/Test/Simple/Changes 2008-05-31 09:19:43.000000000 -0700 @@ -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. ==== //depot/maint-5.10/perl/lib/Test/Simple/t/lib/NoExporter.pm#1 (text) ==== Index: perl/lib/Test/Simple/t/lib/NoExporter.pm --- /dev/null 2008-05-07 15:08:24.549929899 -0700 +++ perl/lib/Test/Simple/t/lib/NoExporter.pm 2008-05-31 09:19:43.000000000 -0700 @@ -0,0 +1,10 @@ +package NoExporter; + +$VERSION = 1.02; +sub import { + shift; + die "NoExporter exports nothing. You asked for: @_" if @_; +} + +1; + ==== //depot/maint-5.10/perl/lib/Test/Simple/t/use_ok.t#2 (text) ==== Index: perl/lib/Test/Simple/t/use_ok.t --- perl/lib/Test/Simple/t/use_ok.t#1~32694~ 2007-12-22 01:23:09.000000000 -0800 +++ perl/lib/Test/Simple/t/use_ok.t 2008-05-31 09:19:43.000000000 -0700 @@ -3,7 +3,7 @@ BEGIN { if( $ENV{PERL_CORE} ) { chdir 't'; - @INC = ('../lib', 'lib'); + @INC = qw(../lib ../lib/Test/Simple/t/lib); } else { unshift @INC, 't/lib'; ==== //depot/maint-5.10/perl/lib/Test/Simple/t/utf8.t#2 (text) ==== Index: perl/lib/Test/Simple/t/utf8.t --- perl/lib/Test/Simple/t/utf8.t#1~33969~ 2008-05-31 08:46:38.000000000 -0700 +++ perl/lib/Test/Simple/t/utf8.t 2008-05-31 09:19:43.000000000 -0700 @@ -10,6 +10,7 @@ use strict; use warnings; +use Test::More skip_all => 'Not yet implemented'; my $have_perlio; BEGIN { @@ -21,8 +22,15 @@ 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 @@ 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 @@ is( $uni, $uni, "Testing $uni" ); is_deeply( [EMAIL PROTECTED], [] ); -} \ No newline at end of file +} ==== //depot/maint-5.10/perl/lib/base/t/lib/Dummy.pm#1 (text) ==== Index: perl/lib/base/t/lib/Dummy.pm --- /dev/null 2008-05-07 15:08:24.549929899 -0700 +++ perl/lib/base/t/lib/Dummy.pm 2008-05-31 09:19:43.000000000 -0700 @@ -0,0 +1,4 @@ +package Dummy; + +# Attempt to emulate a bug with finding the version in Exporter. +$VERSION = '5.562'; ==== //depot/maint-5.10/perl/lib/base/t/version.t#2 (text) ==== Index: perl/lib/base/t/version.t --- perl/lib/base/t/version.t#1~32694~ 2007-12-22 01:23:09.000000000 -0800 +++ perl/lib/base/t/version.t 2008-05-31 09:19:43.000000000 -0700 @@ -3,7 +3,7 @@ BEGIN { if( $ENV{PERL_CORE} ) { chdir 't' if -d 't'; - @INC = qw(../lib ../t/lib); + @INC = qw(../lib ../lib/base/t/lib); } } End of Patch.