Update Test-Simple in blead

This updates to the latest Test-Simple. This fixes several small bugs
including noisy STDERR in the test suite, and leaking TEMP files.

Author: exodist

MANIFEST

@@ -2656,6 +2656,7 @@ cpan/Test-Simple/t/lib/Test/Simple/sample_tests/too_few.plx
 cpan/Test-Simple/t/lib/Test/Simple/sample_tests/two_fail.plx
 cpan/Test-Simple/t/lib/TieOut.pm
 cpan/Test-Simple/t/regression/642_persistent_end.t
+cpan/Test-Simple/t/regression/662-tbt-no-plan.t
 cpan/Test-Simple/t/regression/no_name_in_subtest.t
 cpan/Test-Simple/t/Test2/acceptance/try_it_done_testing.t
 cpan/Test-Simple/t/Test2/acceptance/try_it_fork.t

cpan/Test-Simple/lib/Test/Builder.pm

@@ -4,16 +4,14 @@ use 5.006;
 use strict;
 use warnings;
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
 BEGIN {
     if( $] < 5.008 ) {
         require Test::Builder::IO::Scalar;
     }
 }
 
-use overload();
-
 use Scalar::Util qw/blessed reftype weaken/;
 
 use Test2::Util qw/USE_THREADS try get_tid/;
@@ -40,16 +38,7 @@ use Test::Builder::Formatter;
 use Test::Builder::TodoDiag;
 
 our $Level = 1;
-our $Test = Test::Builder->new;
-
-# Non-TB tools normally expect 0 added to the level. $Level is normally 1. So
-# we only want the level to change if $Level != 1.
-# TB->ctx compensates for this later.
-Test2::API::test2_add_callback_context_aquire(sub {$_[0]->{level} += $Level - 1});
-
-Test2::API::test2_add_callback_exit(sub { $Test->_ending(@_) });
-
-Test2::API::test2_ipc()->set_no_fatal(1) if USE_THREADS;
+our $Test = $ENV{TB_NO_EARLY_INIT} ? undef : Test::Builder->new;
 
 sub _add_ts_hooks {
     my $self = shift;
@@ -102,6 +91,15 @@ sub new {
         my $ctx = context();
         $Test = $class->create(singleton => 1);
         $ctx->release;
+
+        # Non-TB tools normally expect 0 added to the level. $Level is normally 1. So
+        # we only want the level to change if $Level != 1.
+        # TB->ctx compensates for this later.
+        Test2::API::test2_add_callback_context_aquire(sub { $_[0]->{level} += $Level - 1 });
+
+        Test2::API::test2_add_callback_exit(sub { $Test->_ending(@_) });
+
+        Test2::API::test2_ipc()->set_no_fatal(1) if USE_THREADS;
     }
     return $Test;
 }
@@ -304,7 +302,7 @@ sub subtest {
         ($err, $child_error) = ($@, $?);
 
         # They might have done 'BEGIN { skip_all => "whatever" }'
-        if (!$ok && $err =~ m/Label not found for "last T2_SUBTEST_WRAPPER"/) {
+        if (!$ok && $err =~ m/Label not found for "last T2_SUBTEST_WRAPPER"/ || (blessed($err) && blessed($err) eq 'Test::Builder::Exception')) {
             $ok  = undef;
             $err = undef;
         }
@@ -486,6 +484,12 @@ sub no_plan {
 
     my $ctx = $self->ctx;
 
+    if (defined $ctx->hub->plan) {
+        warn "Plan already set, no_plan() is a no-op, this will change to a hard failure in the future.";
+        $ctx->release;
+        return;
+    }
+
     $ctx->alert("no_plan takes no arguments") if $arg;
 
     $ctx->hub->plan('NO PLAN');
@@ -685,6 +689,10 @@ sub _unoverload {
 
     return unless ref $$thing;
     return unless blessed($$thing) || scalar $self->_try(sub{ $$thing->isa('UNIVERSAL') });
+    {
+        local ($!, $@);
+        require overload;
+    }
     my $string_meth = overload::Method( $$thing, $type ) || return;
     $$thing = $$thing->$string_meth();
 }
@@ -1731,9 +1739,9 @@ Ok, so there can be more than one Test::Builder object and this is how
 you get it.  You might use this instead of C<new()> if you're testing
 a Test::Builder based module, but otherwise you probably want C<new>.
 
-B<NOTE>: the implementation is not complete.  C<level>, for example, is
-still shared amongst B<all> Test::Builder objects, even ones created using
-this method.  Also, the method name may change in the future.
+B<NOTE>: the implementation is not complete.  C<level>, for example, is still
+shared by B<all> Test::Builder objects, even ones created using this method.
+Also, the method name may change in the future.
 
 =item B<subtest>
 
@@ -1780,19 +1788,6 @@ will print the appropriate headers and take the appropriate actions.
 
 If you call C<plan()>, don't call any of the other methods below.
 
-If a child calls "skip_all" in the plan, a C<Test::Builder::Exception> is
-thrown.  Trap this error, call C<finalize()> and don't run any more tests on
-the child.
-
- my $child = $Test->child('some child');
- eval { $child->plan( $condition ? ( skip_all => $reason ) : ( tests => 3 )  ) };
- if ( eval { $@->isa('Test::Builder::Exception') } ) {
-    $child->finalize;
-    return;
- }
- # run your tests
-
-
 =item B<expected_tests>
 
     my $max = $Test->expected_tests;
@@ -2020,7 +2015,7 @@ Takes a quoted regular expression produced by C<qr//>, or a string
 representing a regular expression.
 
 Returns a Perl value which may be used instead of the corresponding
-regular expression, or C<undef> if its argument is not recognised.
+regular expression, or C<undef> if its argument is not recognized.
 
 For example, a version of C<like()>, sans the useful diagnostic messages,
 could be written as:
@@ -2440,9 +2435,9 @@ If you fail more than 254 tests, it will be reported as 254.
 
 =head1 THREADS
 
-In perl 5.8.1 and later, Test::Builder is thread-safe.  The test
-number is shared amongst all threads.  This means if one thread sets
-the test number using C<current_test()> they will all be effected.
+In perl 5.8.1 and later, Test::Builder is thread-safe.  The test number is
+shared by all threads.  This means if one thread sets the test number using
+C<current_test()> they will all be effected.
 
 While versions earlier than 5.8.1 had threads they contain too many
 bugs to support.

cpan/Test-Simple/lib/Test/Builder/Formatter.pm

@@ -2,9 +2,9 @@ package Test::Builder::Formatter;
 use strict;
 use warnings;
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
-use base 'Test2::Formatter::TAP';
+BEGIN { require Test2::Formatter::TAP; our @ISA = qw(Test2::Formatter::TAP) }
 
 use Test2::Util::HashBase qw/no_header no_diag/;
 

cpan/Test-Simple/lib/Test/Builder/Module.pm

@@ -2,12 +2,12 @@ package Test::Builder::Module;
 
 use strict;
 
-use Test::Builder 1.00;
+use Test::Builder;
 
 require Exporter;
 our @ISA = qw(Exporter);
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
 
 =head1 NAME
@@ -89,7 +89,8 @@ sub import {
 
     $test->plan(@_);
 
-    $class->export_to_level( 1, $class, @imports );
+    local $Exporter::ExportLevel = $Exporter::ExportLevel + 1;
+    $class->Exporter::import(@imports);
 }
 
 sub _strip_imports {

cpan/Test-Simple/lib/Test/Builder/Tester.pm

@@ -1,9 +1,9 @@
 package Test::Builder::Tester;
 
 use strict;
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
-use Test::Builder 0.99;
+use Test::Builder;
 use Symbol;
 use Carp;
 

cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm

@@ -1,7 +1,7 @@
 package Test::Builder::Tester::Color;
 
 use strict;
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
 require Test::Builder::Tester;
 

cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm

@@ -2,9 +2,9 @@ package Test::Builder::TodoDiag;
 use strict;
 use warnings;
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
-use base 'Test2::Event::Diag';
+BEGIN { require Test2::Event::Diag; our @ISA = qw(Test2::Event::Diag) }
 
 sub diagnostics { 0 }
 

cpan/Test-Simple/lib/Test/More.pm

@@ -17,9 +17,9 @@ sub _carp {
     return warn @_, " at $file line $line\n";
 }
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
-use Test::Builder::Module 0.99;
+use Test::Builder::Module;
 our @ISA    = qw(Test::Builder::Module);
 our @EXPORT = qw(ok use_ok require_ok
   is isnt like unlike is_deeply
@@ -175,12 +175,22 @@ sub import_extra {
 
     my @other = ();
     my $idx   = 0;
+    my $import;
     while( $idx <= $#{$list} ) {
         my $item = $list->[$idx];
 
         if( defined $item and $item eq 'no_diag' ) {
             $class->builder->no_diag(1);
         }
+        elsif( defined $item and $item eq 'import' ) {
+            if ($import) {
+                push @$import, @{$list->[ ++$idx ]};
+            }
+            else {
+                $import = $list->[ ++$idx ];
+                push @other, $item, $import;
+            }
+        }
         else {
             push @other, $item;
         }
@@ -190,6 +200,18 @@ sub import_extra {
 
     @$list = @other;
 
+    if ($class eq __PACKAGE__ && (!$import || grep $_ eq '$TODO', @$import)) {
+        my $to = $class->builder->exported_to;
+        no strict 'refs';
+        *{"$to\::TODO"} = \our $TODO;
+        if ($import) {
+            @$import = grep $_ ne '$TODO', @$import;
+        }
+        else {
+            push @$list, import => [grep $_ ne '$TODO', @EXPORT];
+        }
+    }
+
     return;
 }
 

cpan/Test-Simple/lib/Test/Simple.pm

@@ -4,9 +4,9 @@ use 5.006;
 
 use strict;
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
-use Test::Builder::Module 0.99;
+use Test::Builder::Module;
 our @ISA    = qw(Test::Builder::Module);
 our @EXPORT = qw(ok);
 

cpan/Test-Simple/lib/Test/Tester.pm

@@ -18,7 +18,7 @@ require Exporter;
 
 use vars qw( @ISA @EXPORT );
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
 @EXPORT = qw( run_tests check_tests check_test cmp_results show_space );
 @ISA = qw( Exporter );
@@ -40,7 +40,7 @@ sub show_space
 my $colour = '';
 my $reset = '';
 
-if (my $want_colour = $ENV{TESTTESTERCOLOUR} || $ENV{TESTTESTERCOLOUR})
+if (my $want_colour = $ENV{TESTTESTERCOLOUR} || $ENV{TESTTESTERCOLOR})
 {
 	if (eval "require Term::ANSIColor")
 	{
@@ -447,7 +447,7 @@ diagnostics output B<after> the test result is declared.
 
 Note that Test::Builder ensures that any diagnostics end in a \n and
 it in earlier versions of Test::Tester it was essential that you have
-the final \n in your expected diagnostics. From version 0.10 onwards,
+the final \n in your expected diagnostics. From version 0.10 onward,
 Test::Tester will add the \n if you forgot it. It will not add a \n if
 you are expecting no diagnostics. See below for help tracking down
 hard to find space and tab related problems.
@@ -496,7 +496,7 @@ are scratching your head trying to work out why Test::Tester is saying that
 your diagnostics are wrong when they look perfectly right then the answer is
 probably whitespace. From version 0.10 on, Test::Tester surrounds the
 expected and got diag values with single quotes to make it easier to spot
-trailing whitesapce. So in this example
+trailing whitespace. So in this example
 
   # Got diag (5 bytes):
   # 'abcd '
@@ -514,7 +514,7 @@ switch Test::Tester into a mode whereby all "tricky" characters are shown as
 \{xx}. Tricky characters are those with ASCII code less than 33 or higher
 than 126. This makes the output more difficult to read but much easier to
 find subtle differences between strings. To turn on this mode either call
-show_space() in your test script or set the TESTTESTERSPACE environment
+C<show_space()> in your test script or set the C<TESTTESTERSPACE> environment
 variable to be a true value. The example above would then look like
 
   # Got diag (5 bytes):
@@ -525,13 +525,13 @@ variable to be a true value. The example above would then look like
 =head1 COLOUR
 
 If you prefer to use colour as a means of finding tricky whitespace
-characters then you can set the TESTTESTCOLOUR environment variable to a
+characters then you can set the C<TESTTESTCOLOUR> environment variable to a
 comma separated pair of colours, the first for the foreground, the second
 for the background. For example "white,red" will print white text on a red
 background. This requires the Term::ANSIColor module. You can specify any
 colour that would be acceptable to the Term::ANSIColor::color function.
 
-If you spell colour differently, that's no problem. The TESTTESTERCOLOR
+If you spell colour differently, that's no problem. The C<TESTTESTERCOLOR>
 variable also works (if both are set then the British spelling wins out).
 
 =head1 EXPORTED FUNCTIONS

cpan/Test-Simple/lib/Test/Tester/Capture.pm

@@ -2,7 +2,7 @@ use strict;
 
 package Test::Tester::Capture;
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
 
 use Test::Builder;

cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm

@@ -3,7 +3,7 @@ use strict;
 
 package Test::Tester::CaptureRunner;
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
 
 use Test::Tester::Capture;

cpan/Test-Simple/lib/Test/Tester/Delegate.pm

@@ -3,7 +3,7 @@ use warnings;
 
 package Test::Tester::Delegate;
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
 
 use vars '$AUTOLOAD';

cpan/Test-Simple/lib/Test/use/ok.pm

@@ -1,7 +1,7 @@
 package Test::use::ok;
 use 5.005;
 
-our $VERSION = '1.302015';
+our $VERSION = '1.302022';
 
 
 __END__