Update to include latest Test::Builder alpha

Also updated some tests that the new builder broke

1 files changed, 204 insertions, 136 deletions

diff --git a/MANIFEST b/MANIFEST
index 8479f032c9..4ef6fda1d5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2233,146 +2233,214 @@ cpan/Test-Harness/t/yamlish-output.t			Test::Harness test
 cpan/Test-Harness/t/yamlish.t				Test::Harness test
 cpan/Test-Harness/t/yamlish-writer.t			Test::Harness test
 cpan/Test/lib/Test.pm		A simple framework for writing test scripts
-cpan/Test-Simple/lib/Test/Builder/Module.pm		Base class for test modules
-cpan/Test-Simple/lib/Test/Builder.pm			For writing new test libraries
-cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm	Turn on color in Test::Builder::Tester
-cpan/Test-Simple/lib/Test/Builder/Tester.pm		For testing Test::Builder based classes
-cpan/Test-Simple/lib/Test/More.pm			More utilities for writing tests
-cpan/Test-Simple/lib/Test/Simple.pm			Basic utility for writing tests
-cpan/Test-Simple/lib/Test/Tutorial.pod			A tutorial on writing tests
-cpan/Test-Simple/t/00test_harness_check.t		Test::Simple test
-cpan/Test-Simple/t/bad_plan.t				Test::Builder plan() test
-cpan/Test-Simple/t/bail_out.t				Test::Builder BAIL_OUT test
-cpan/Test-Simple/t/BEGIN_require_ok.t			Test::More require_ok() testing
-cpan/Test-Simple/t/BEGIN_use_ok.t			Test::More use_ok() testing
-cpan/Test-Simple/t/buffer.t				Test::Builder buffering test
-cpan/Test-Simple/t/Builder/Builder.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/carp.t			Test::Builder test
-cpan/Test-Simple/t/Builder/create.t			Test::Builder test
-cpan/Test-Simple/t/Builder/current_test.t		Test::Builder tests
-cpan/Test-Simple/t/Builder/current_test_without_plan.t	Test::Builder tests
-cpan/Test-Simple/t/Builder/details.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/done_testing_double.t		Test::Builder tests
-cpan/Test-Simple/t/Builder/done_testing_plan_mismatch.t	Test::Builder tests
-cpan/Test-Simple/t/Builder/done_testing.t		Test::Builder tests
-cpan/Test-Simple/t/Builder/done_testing_with_no_plan.t	Test::Builder tests
-cpan/Test-Simple/t/Builder/done_testing_with_number.t	Test::Builder tests
-cpan/Test-Simple/t/Builder/done_testing_with_plan.t	Test::Builder tests
-cpan/Test-Simple/t/Builder/fork_with_new_stdout.t	Test::Builder tests
-cpan/Test-Simple/t/Builder/has_plan2.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/has_plan.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/is_fh.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/is_passing.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/maybe_regex.t		Test::Builder tests
-cpan/Test-Simple/t/Builder/no_diag.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/no_ending.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/no_header.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/no_plan_at_all.t		Test::Builder tests
-cpan/Test-Simple/t/Builder/ok_obj.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/output.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/reset.t			Test::Builder tests
-cpan/Test-Simple/t/Builder/try.t			Test::Builder tests
-cpan/Test-Simple/t/c_flag.t				Test::Simple test
-cpan/Test-Simple/t/circular_data.t			Test::Simple test
-cpan/Test-Simple/t/cmp_ok.t				Test::More test
-cpan/Test-Simple/t/dependents.t				Test::More test
-cpan/Test-Simple/t/diag.t				Test::More diag() test
-cpan/Test-Simple/t/died.t				Test::Simple test
-cpan/Test-Simple/t/dont_overwrite_die_handler.t		Test::More tests
-cpan/Test-Simple/t/eq_set.t				Test::Simple test
-cpan/Test-Simple/t/exit.t				Test::Simple test, exit codes
-cpan/Test-Simple/t/explain.t				Test::Simple test
-cpan/Test-Simple/t/extra_one.t				Test::Simple test
-cpan/Test-Simple/t/extra.t				Test::Simple test
-cpan/Test-Simple/t/fail-like.t				Test::More test, like() failures
-cpan/Test-Simple/t/fail-more.t				Test::More test, tests failing
-cpan/Test-Simple/t/fail_one.t				Test::Simple test
-cpan/Test-Simple/t/fail.t				Test::Simple test, test failures
-cpan/Test-Simple/t/filehandles.t			Test::Simple test, STDOUT can be played with
-cpan/Test-Simple/t/fork.t				Test::More fork tests
-cpan/Test-Simple/t/harness_active.t			Test::Simple test
-cpan/Test-Simple/t/import.t				Test::More test, importing functions
-cpan/Test-Simple/t/is_deeply_dne_bug.t			Test::More test
-cpan/Test-Simple/t/is_deeply_fail.t			Test::More test, is_deeply()
-cpan/Test-Simple/t/is_deeply_with_threads.t		Test::More test
-cpan/Test-Simple/t/lib/Dev/Null.pm			Test::More test module
-cpan/Test-Simple/t/lib/Dummy.pm				Test::More test module
-cpan/Test-Simple/t/lib/MyOverload.pm			Test::More test module
-cpan/Test-Simple/t/lib/NoExporter.pm			Test::Simple test module
-cpan/Test-Simple/t/lib/SigDie.pm			Test module for Test::More
-cpan/Test-Simple/t/lib/Test/Builder/NoOutput.pm		Utility module for testing Test::Builder
-cpan/Test-Simple/t/lib/Test/Simple/Catch.pm		Utility module for testing Test::Simple
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/death_in_eval.plx	for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/death.plx		for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/death_with_handler.plx	for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/exit.plx			for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/extras.plx		for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/five_fail.plx		for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/last_minute_death.plx	for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/missing_done_testing.plx	for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/one_fail.plx		for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/one_fail_without_plan.plx	for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/require.plx		for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/success.plx		for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/too_few_fail.plx		for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/too_few.plx		for exit.t
-cpan/Test-Simple/t/lib/Test/Simple/sample_tests/two_fail.plx		for exit.t
-cpan/Test-Simple/t/lib/TieOut.pm			Testing library to capture prints
-cpan/Test-Simple/t/missing.t				Test::Simple test, missing tests
-cpan/Test-Simple/t/More.t				Test::More test, basic stuff
-cpan/Test-Simple/t/new_ok.t				Test::More test
-cpan/Test-Simple/t/no_plan.t				Test::Simple test, forgot the plan
-cpan/Test-Simple/t/no_tests.t				Test::More test
-cpan/Test-Simple/t/note.t				Test::More test
-cpan/Test-Simple/t/overload.t				Test::Simple test
-cpan/Test-Simple/t/overload_threads.t			Test::Simple test
-cpan/Test-Simple/t/plan_bad.t				Test::Simple test
-cpan/Test-Simple/t/plan_is_noplan.t			Test::Simple test, no_plan
-cpan/Test-Simple/t/plan_no_plan.t			Test::More test, plan() w/no_plan
-cpan/Test-Simple/t/plan_shouldnt_import.t		Test::Simple test
-cpan/Test-Simple/t/plan_skip_all.t			Test::More test, plan() w/skip_all
-cpan/Test-Simple/t/plan.t				Test::More test, plan()
-cpan/Test-Simple/t/require_ok.t				Test::Simple test
-cpan/Test-Simple/t/Simple/load.t			Test::Builder tests
-cpan/Test-Simple/t/simple.t				Test::Simple test, basic stuff
-cpan/Test-Simple/t/skipall.t				Test::More test, skip all tests
-cpan/Test-Simple/t/skip.t				Test::More test, SKIP tests
-cpan/Test-Simple/t/subtest/args.t			Test::More test
-cpan/Test-Simple/t/subtest/bail_out.t			Test::More test
-cpan/Test-Simple/t/subtest/basic.t			Test::More test
-cpan/Test-Simple/t/subtest/die.t			Test::More test
-cpan/Test-Simple/t/subtest/do.t				Test::More test
-cpan/Test-Simple/t/subtest/exceptions.t			Test::More test
-cpan/Test-Simple/t/subtest/for_do_t.test		Test::More test
-cpan/Test-Simple/t/subtest/fork.t			Test::Builder tests
-cpan/Test-Simple/t/subtest/implicit_done.t			Test::Builder tests
-cpan/Test-Simple/t/subtest/line_numbers.t			Test::Builder tests
-cpan/Test-Simple/t/subtest/plan.t			Test::Builder tests
-cpan/Test-Simple/t/subtest/predicate.t			Test::Builder tests
-cpan/Test-Simple/t/subtest/singleton.t			Test::More test
-cpan/Test-Simple/t/subtest/threads.t			Test::More test
-cpan/Test-Simple/t/subtest/todo.t			Test::Builder tests
-cpan/Test-Simple/t/subtest/wstat.t			Test::More test
-cpan/Test-Simple/t/tbm_doesnt_set_exported_to.t		Test::Builder::Module test
+cpan/Test-Simple/lib/ok.pm			Tool for testing module loading
+cpan/Test-Simple/lib/Test/Builder/ExitMagic.pm			Handle $? when tests exit
+cpan/Test-Simple/lib/Test/Builder/Fork.pm			Forking support for Test::Builder
+cpan/Test-Simple/lib/Test/Builder/Formatter/LegacyResults.pm			Legacy support
+cpan/Test-Simple/lib/Test/Builder/Formatter.pm			Base class for formatters
+cpan/Test-Simple/lib/Test/Builder/Formatter/TAP.pm			TAP formatter
+cpan/Test-Simple/lib/Test/Builder/Module.pm			Deprecated tester base class
+cpan/Test-Simple/lib/Test/Builder.pm			The meat of Test::Builder
+cpan/Test-Simple/lib/Test/Builder/Provider.pm			Tool for building testers
+cpan/Test-Simple/lib/Test/Builder/Result/Bail.pm			Bail result
+cpan/Test-Simple/lib/Test/Builder/Result/Child.pm			Child result
+cpan/Test-Simple/lib/Test/Builder/Result/Diag.pm			Diag result
+cpan/Test-Simple/lib/Test/Builder/Result/Finish.pm			Finish result
+cpan/Test-Simple/lib/Test/Builder/Result/Note.pm			Note result
+cpan/Test-Simple/lib/Test/Builder/Result/Ok.pm			Ok result
+cpan/Test-Simple/lib/Test/Builder/Result/Plan.pm			Plan result
+cpan/Test-Simple/lib/Test/Builder/Result.pm			Result base class
+cpan/Test-Simple/lib/Test/Builder/Stream.pm			The test stream
+cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm			Part of Test::Tester
+cpan/Test-Simple/lib/Test/Builder/Tester.pm			Tool for validating testers
+cpan/Test-Simple/lib/Test/Builder/Threads.pm			Thread utisl for Test::Builder
+cpan/Test-Simple/lib/Test/Builder/Trace/Frame.pm			Frame in a stack trace
+cpan/Test-Simple/lib/Test/Builder/Trace.pm			Tool for building and analyzing stack traces
+cpan/Test-Simple/lib/Test/Builder/Util.pm			Common utils used throughout Test::Builder
+cpan/Test-Simple/lib/Test/FAQ.pod			Frequently Asked Questions
+cpan/Test-Simple/lib/Test/More.pm			More tools for testing
+cpan/Test-Simple/lib/Test/Simple.pm			tools for testing
+cpan/Test-Simple/lib/Test/Tester2.pm			Tool for testing testers
+cpan/Test-Simple/lib/Test/Tester/Capture.pm			Part of Test::Tester
+cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm			Part of Test::Tester
+cpan/Test-Simple/lib/Test/Tester/Delegate.pm			Part of Test::Tester
+cpan/Test-Simple/lib/Test/Tester.pm			Tool for testing testers
+cpan/Test-Simple/lib/Test/Tutorial.pod			Testing Tutorial
+cpan/Test-Simple/lib/Test/use/ok.pm			Tool for testing module loading
+cpan/Test-Simple/t/00test_harness_check.t			Test::Builder legacy test
+cpan/Test-Simple/t/bad_plan.t			Test::Builder legacy test
+cpan/Test-Simple/t/bail_out.t			Test::Builder legacy test
+cpan/Test-Simple/t/BEGIN_require_ok.t			Test::Builder legacy test
+cpan/Test-Simple/t/BEGIN_use_ok.t			Test::Builder legacy test
+cpan/Test-Simple/t/buffer.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/Builder.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/carp.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/create.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/current_test.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/current_test_without_plan.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/details.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/done_testing_double.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/done_testing_plan_mismatch.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/done_testing.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/done_testing_with_no_plan.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/done_testing_with_number.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/done_testing_with_plan.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/fork_with_new_stdout.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/has_plan2.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/has_plan.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/is_fh.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/is_passing.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/maybe_regex.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/no_diag.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/no_ending.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/no_header.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/no_plan_at_all.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/ok_obj.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/output.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/reset_outputs.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/reset.t			Test::Builder legacy test
+cpan/Test-Simple/t/Builder/try.t			Test::Builder legacy test
+cpan/Test-Simple/t/c_flag.t			Test::Builder legacy test
+cpan/Test-Simple/t/circular_data.t			Test::Builder legacy test
+cpan/Test-Simple/t/cmp_ok.t			Test::Builder legacy test
+cpan/Test-Simple/t/dependents.t			Test::Builder legacy test
+cpan/Test-Simple/t/diag.t			Test::Builder legacy test
+cpan/Test-Simple/t/died.t			Test::Builder legacy test
+cpan/Test-Simple/t/dont_overwrite_die_handler.t			Test::Builder legacy test
+cpan/Test-Simple/t/eq_set.t			Test::Builder legacy test
+cpan/Test-Simple/t/exit.t			Test::Builder legacy test
+cpan/Test-Simple/t/explain.t			Test::Builder legacy test
+cpan/Test-Simple/t/extra_one.t			Test::Builder legacy test
+cpan/Test-Simple/t/extra.t			Test::Builder legacy test
+cpan/Test-Simple/t/fail-like.t			Test::Builder legacy test
+cpan/Test-Simple/t/fail-more.t			Test::Builder legacy test
+cpan/Test-Simple/t/fail_one.t			Test::Builder legacy test
+cpan/Test-Simple/t/fail.t			Test::Builder legacy test
+cpan/Test-Simple/t/filehandles.t			Test::Builder legacy test
+cpan/Test-Simple/t/fork.t			Test::Builder legacy test
+cpan/Test-Simple/t/harness_active.t			Test::Builder legacy test
+cpan/Test-Simple/t/import.t			Test::Builder legacy test
+cpan/Test-Simple/t/is_deeply_dne_bug.t			Test::Builder legacy test
+cpan/Test-Simple/t/is_deeply_fail.t			Test::Builder legacy test
+cpan/Test-Simple/t/is_deeply_with_threads.t			Test::Builder legacy test
+cpan/Test-Simple/t/lib/Dev/Null.pm			Test helper module
+cpan/Test-Simple/t/lib/Dummy.pm			Test helper module
+cpan/Test-Simple/t/lib/MyOverload.pm			Test helper module
+cpan/Test-Simple/t/lib/MyTest.pm			Test helper module
+cpan/Test-Simple/t/lib/NoExporter.pm			Test helper module
+cpan/Test-Simple/t/lib/SigDie.pm			Test helper module
+cpan/Test-Simple/t/lib/SmallTest.pm			Test helper module
+cpan/Test-Simple/t/lib/Test/Builder/NoOutput.pm			Test helper module
+cpan/Test-Simple/t/lib/Test/Simple/Catch.pm			Test helper module
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/death_in_eval.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/death.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/death_with_handler.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/exit.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/extras.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/five_fail.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/last_minute_death.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/missing_done_testing.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/one_fail.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/one_fail_without_plan.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/pre_plan_death.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/require.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/success.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/too_few_fail.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/too_few.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/Test/Simple/sample_tests/two_fail.plx			Sample test used in tests
+cpan/Test-Simple/t/lib/TieOut.pm			Test helper module
+cpan/Test-Simple/t/missing.t			Test::Builder legacy test
+cpan/Test-Simple/t/Modern/Builder_Fork.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Formatter.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Formatter_TAP.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Module.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Provider.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Result_Child.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Result_Diag.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Result_Finish.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Result_Note.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Result_Ok.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Result_Plan.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Result.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Stream.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Tester.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Trace_Frame.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Trace.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Builder_Util.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/encoding_test.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/More.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/NotTB15.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Simple.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Tester2_subtest.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/Tester2.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/Modern/tracing.t			Test for modern Test::Builder features
+cpan/Test-Simple/t/More.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/new_ok.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/no_plan.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/no_tests.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/note.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/overload.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/overload_threads.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/PerlIO.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/plan_bad.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/plan_is_noplan.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/plan_no_plan.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/plan_shouldnt_import.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/plan_skip_all.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/plan.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/pod-coverage.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/pod.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/require_ok.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/ribasushi_diag.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/ribasushi_threads.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/Simple/load.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/simple.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/skipall.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/skip.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/strays.t			Legacy test for Test::Builder
+cpan/Test-Simple/t/subtest/args.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/bail_out.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/basic.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/die.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/do.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/exceptions.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/for_do_t.test			Legacy subtest test
+cpan/Test-Simple/t/subtest/fork.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/implicit_done.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/line_numbers.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/plan.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/predicate.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/singleton.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/threads.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/todo.t			Legacy subtest test
+cpan/Test-Simple/t/subtest/wstat.t			Legacy subtest test
+cpan/Test-Simple/t/tbm_doesnt_set_exported_to.t			Legacy test
 cpan/Test-Simple/t/Tester/tbt_01basic.t			Test::Builder::Tester test
-cpan/Test-Simple/t/Tester/tbt_02fhrestore.t		Test::Builder::Tester test
+cpan/Test-Simple/t/Tester/tbt_02fhrestore.t			Test::Builder::Tester test
 cpan/Test-Simple/t/Tester/tbt_03die.t			Test::Builder::Tester test
-cpan/Test-Simple/t/Tester/tbt_04line_num.t		Test::Builder::Tester test
-cpan/Test-Simple/t/Tester/tbt_05faildiag.t		Test::Builder::Tester test
-cpan/Test-Simple/t/Tester/tbt_06errormess.t		Test::Builder::Tester test
+cpan/Test-Simple/t/Tester/tbt_04line_num.t			Test::Builder::Tester test
+cpan/Test-Simple/t/Tester/tbt_05faildiag.t			Test::Builder::Tester test
+cpan/Test-Simple/t/Tester/tbt_06errormess.t			Test::Builder::Tester test
 cpan/Test-Simple/t/Tester/tbt_07args.t			Test::Builder::Tester test
-cpan/Test-Simple/t/Tester/tbt_08subtest.t		Test::Builder::Tester test
-cpan/Test-Simple/t/Tester/tbt_09do_script.pl		Test::Builder::Tester test
+cpan/Test-Simple/t/Tester/tbt_08subtest.t			Test::Builder::Tester test
+cpan/Test-Simple/t/Tester/tbt_09do_script.pl			Test::Builder::Tester test
 cpan/Test-Simple/t/Tester/tbt_09do.t			Test::Builder::Tester test
-cpan/Test-Simple/t/threads.t				Test::Builder thread-safe checks
-cpan/Test-Simple/t/thread_taint.t			Test::Simple test
-cpan/Test-Simple/t/todo.t				Test::More test, TODO tests
-cpan/Test-Simple/t/undef.t				Test::More test, undefs don't cause warnings
-cpan/Test-Simple/t/useing.t				Test::More test, compile test
-cpan/Test-Simple/t/use_ok.t				Test::More test, use_ok()
-cpan/Test-Simple/t/utf8.t				Test::More test
-cpan/Test-Simple/t/versions.t				Test::More test
+cpan/Test-Simple/t/Tester/tbt_is_bug.t			Test::Builder::Tester test
+cpan/Test-Simple/t/test_use_ok.t			Legacy Test::Builder::Test
+cpan/Test-Simple/t/threads.t			Legacy Test::Builder::Test
+cpan/Test-Simple/t/thread_taint.t			Legacy Test::Builder::Test
+cpan/Test-Simple/t/todo.t			Legacy Test::Builder::Test
+cpan/Test-Simple/t/TTLegacy/auto.t			Test for old Test::Tester
+cpan/Test-Simple/t/TTLegacy/capture.t			Test for old Test::Tester
+cpan/Test-Simple/t/TTLegacy/check_tests.t			Test for old Test::Tester
+cpan/Test-Simple/t/TTLegacy/depth.t			Test for old Test::Tester
+cpan/Test-Simple/t/TTLegacy/run_test.t			Test for old Test::Tester
+cpan/Test-Simple/t/undef.t			Legacy Test::Builder test
+cpan/Test-Simple/t/useing.t			Legacy Test::Builder test
+cpan/Test-Simple/t/use_ok.t			Legacy Test::Builder test
+cpan/Test-Simple/t/utf8.t			Legacy Test::Builder test
+cpan/Test-Simple/t/versions.t			Test for Test::Builder version numbers
 cpan/Test/t/05_about_verbose.t	See if Test works
 cpan/Test/t/fail.t		See if Test works
 cpan/Test/t/mix.t		See if Test works