Change 33108 by [EMAIL PROTECTED] on 2008/01/29 17:37:50
Integrate:
[ 32650]
Update to Test-Simple-0.74
Affected files ...
... //depot/maint-5.10/perl/MANIFEST#4 integrate
... //depot/maint-5.10/perl/lib/Test/Builder.pm#2 integrate
... //depot/maint-5.10/perl/lib/Test/Builder/Module.pm#2 integrate
... //depot/maint-5.10/perl/lib/Test/Builder/Tester.pm#2 integrate
... //depot/maint-5.10/perl/lib/Test/More.pm#2 integrate
... //depot/maint-5.10/perl/lib/Test/Simple.pm#2 integrate
... //depot/maint-5.10/perl/lib/Test/Simple/Changes#2 integrate
... //depot/maint-5.10/perl/lib/Test/Simple/t/BEGIN_use_ok.t#1 branch
Differences ...
==== //depot/maint-5.10/perl/MANIFEST#4 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST#3~32697~ 2007-12-22 02:26:16.000000000 -0800
+++ perl/MANIFEST 2008-01-29 09:37:50.000000000 -0800
@@ -2630,6 +2630,7 @@
lib/Test/Simple/t/00test_harness_check.t Test::Simple test
lib/Test/Simple/t/bad_plan.t Test::Builder plan() test
lib/Test/Simple/t/bail_out.t Test::Builder BAIL_OUT test
+lib/Test/Simple/t/BEGIN_use_ok.t Test::More use_ok() testing
lib/Test/Simple/t/buffer.t Test::Builder buffering test
lib/Test/Simple/t/Builder.t Test::Builder tests
lib/Test/Simple/t/carp.t Test::Builder test
==== //depot/maint-5.10/perl/lib/Test/Builder.pm#2 (text) ====
Index: perl/lib/Test/Builder.pm
--- perl/lib/Test/Builder.pm#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/lib/Test/Builder.pm 2008-01-29 09:37:50.000000000 -0800
@@ -8,7 +8,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.72';
+$VERSION = '0.74';
$VERSION = eval $VERSION; # make the alpha version come out as a number
# Make Test::Builder thread-safe for ithreads.
==== //depot/maint-5.10/perl/lib/Test/Builder/Module.pm#2 (text) ====
Index: perl/lib/Test/Builder/Module.pm
--- perl/lib/Test/Builder/Module.pm#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/lib/Test/Builder/Module.pm 2008-01-29 09:37:50.000000000 -0800
@@ -5,7 +5,7 @@
require Exporter;
@ISA = qw(Exporter);
-$VERSION = '0.72';
+$VERSION = '0.74';
use strict;
==== //depot/maint-5.10/perl/lib/Test/Builder/Tester.pm#2 (text) ====
Index: perl/lib/Test/Builder/Tester.pm
--- perl/lib/Test/Builder/Tester.pm#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/lib/Test/Builder/Tester.pm 2008-01-29 09:37:50.000000000 -0800
@@ -2,7 +2,7 @@
use strict;
use vars qw(@EXPORT $VERSION @ISA);
-$VERSION = "1.09";
+$VERSION = "1.11";
use Test::Builder;
use Symbol;
==== //depot/maint-5.10/perl/lib/Test/More.pm#2 (text) ====
Index: perl/lib/Test/More.pm
--- perl/lib/Test/More.pm#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/lib/Test/More.pm 2008-01-29 09:37:50.000000000 -0800
@@ -16,7 +16,7 @@
use vars qw($VERSION @ISA @EXPORT %EXPORT_TAGS $TODO);
-$VERSION = '0.72';
+$VERSION = '0.74';
$VERSION = eval $VERSION; # make the alpha version come out as a number
use Test::Builder::Module;
@@ -659,32 +659,37 @@
my($pack,$filename,$line) = caller;
- local($@,$!,$SIG{__DIE__}); # isolate eval
+ # Work around a glitch in $@ and eval
+ my $eval_error;
+ {
+ local($@,$!,$SIG{__DIE__}); # isolate eval
- if( @imports == 1 and $imports[0] =~ /^\d+(?:\.\d+)?$/ ) {
- # probably a version check. Perl needs to see the bare number
- # for it to work with non-Exporter based modules.
- eval <<USE;
+ if( @imports == 1 and $imports[0] =~ /^\d+(?:\.\d+)?$/ ) {
+ # probably a version check. Perl needs to see the bare number
+ # for it to work with non-Exporter based modules.
+ eval <<USE;
package $pack;
use $module $imports[0];
USE
- }
- else {
- eval <<USE;
+ }
+ else {
+ eval <<USE;
package $pack;
use $module [EMAIL PROTECTED];
USE
+ }
+ $eval_error = $@;
}
- my $ok = $tb->ok( !$@, "use $module;" );
+ my $ok = $tb->ok( !$eval_error, "use $module;" );
unless( $ok ) {
- chomp $@;
+ chomp $eval_error;
$@ =~ s{^BEGIN failed--compilation aborted at .*$}
{BEGIN failed--compilation aborted at $filename line $line.}m;
$tb->diag(<<DIAGNOSTIC);
Tried to use '$module'.
- Error: $@
+ Error: $eval_error
DIAGNOSTIC
}
==== //depot/maint-5.10/perl/lib/Test/Simple.pm#2 (text) ====
Index: perl/lib/Test/Simple.pm
--- perl/lib/Test/Simple.pm#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/lib/Test/Simple.pm 2008-01-29 09:37:50.000000000 -0800
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.72';
+$VERSION = '0.74';
$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#2 (text) ====
Index: perl/lib/Test/Simple/Changes
--- perl/lib/Test/Simple/Changes#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/lib/Test/Simple/Changes 2008-01-29 09:37:50.000000000 -0800
@@ -1,8 +1,16 @@
+0.74 Thu Nov 29 15:39:57 PST 2007
+ Misc
+ - Add abstract and author to the meta information.
+
+0.73_01 Mon Oct 15 20:35:15 EDT 2007
+ Bug fixes
+ * Put the use_ok() fix from 0.71 back.
+
0.72 Wed Sep 19 20:08:07 PDT 2007
Bug unfixes
* The BEGIN { use_ok } fix for [rt.cpan.org 28345] revealed a small pile
of
- mistakes in CPAN module test suites. Rolling the fix back to give the
authors
- a bit of time to fix their tests.
+ mistakes in CPAN module test suites. Rolling the fix back to give the
+ authors a bit of time to fix their tests.
0.71 Thu Sep 13 20:42:36 PDT 2007
Bug fixes
@@ -15,8 +23,8 @@
- Removed dependency on Text::Soundex [rt.cpan.org 25022]
- Fixed a 5.5.x failure in fail-more.t
* Got rid of the annoying sort_bug.t test that revealed problems with some
- threaded perls. It was testing the deprecated eq_* functions and not
worth the
- bother. Now it tests is_deeply(). [rt.cpan.org 17791]
+ threaded perls. It was testing the deprecated eq_* functions and not
+ worth the bother. Now it tests is_deeply(). [rt.cpan.org 17791]
Doc fixes
- Minor POD mistake in Test::Builder [rt.cpan.org 28869]
==== //depot/maint-5.10/perl/lib/Test/Simple/t/BEGIN_use_ok.t#1 (text) ====
Index: perl/lib/Test/Simple/t/BEGIN_use_ok.t
--- /dev/null 2008-01-25 10:48:57.533235220 -0800
+++ perl/lib/Test/Simple/t/BEGIN_use_ok.t 2008-01-29 09:37:50.000000000
-0800
@@ -0,0 +1,28 @@
+#!/usr/bin/perl -w
+
+# [rt.cpan.org 28345]
+#
+# A use_ok() inside a BEGIN block lacking a plan would be silently ignored.
+
+BEGIN {
+ if( $ENV{PERL_CORE} ) {
+ chdir 't';
+ @INC = ('../lib', 'lib');
+ }
+ else {
+ unshift @INC, 't/lib';
+ }
+}
+
+use Test::More;
+
+my $result;
+BEGIN {
+ eval {
+ use_ok("Wibble");
+ };
+ $result = $@;
+}
+
+plan tests => 1;
+like $result, '/^You tried to run a test without a plan/';
End of Patch.
