From: Steve Hay Date: Mon, 12 Oct 2009 16:21:05 +0000 (+0100) Subject: Remove Test-Simple's 00compile.t from core X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3a2461997c4ea41f425afe2d21ff1e63cbd07365;p=p5sagit%2Fp5-mst-13.2.git Remove Test-Simple's 00compile.t from core It required a hand-edited version of Test-Simple's MANIFEST due to the exclusion of a .pm file from core, but we shouldn't have edited versions of CPAN files in core. The presence of the MANIFEST file also caused warnings from the Makefile.PL due to other files being excluded from core, so rather than further editing of the MANIFEST it is simplest to just remove it and the test that requires it. --- diff --git a/MANIFEST b/MANIFEST index 499919e..861bdc8 100644 --- a/MANIFEST +++ b/MANIFEST @@ -2211,9 +2211,7 @@ cpan/Test-Simple/lib/Test/Builder/Tester.pm For testing Test::Builder based cla 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/MANIFEST Test::Simple MANIFEST cpan/Test-Simple/README Test::Simple README -cpan/Test-Simple/t/00compile.t Test::Simple test 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 diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index b740727..15ef465 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1438,13 +1438,10 @@ use File::Glob qw(:case); 'MAINTAINER' => 'mschwern', 'DISTRIBUTION' => 'MSCHWERN/Test-Simple-0.94.tar.gz', 'FILES' => q[cpan/Test-Simple], - # Note: Test-Simple's MANIFEST file had to be adjusted for - # the 00compile.t test due to the omission of lib/Test/ - # Builder/IO/Scalar.pm. Perhaps it would be better to - # exclude that test script and the MANIFEST file instead? 'EXCLUDED' => [ qw{.perlcriticrc .perltidyrc + t/00compile.t t/pod.t t/pod-coverage.t t/Builder/reset_outputs.t diff --git a/cpan/Test-Simple/MANIFEST b/cpan/Test-Simple/MANIFEST deleted file mode 100644 index b3d5fa4..0000000 --- a/cpan/Test-Simple/MANIFEST +++ /dev/null @@ -1,141 +0,0 @@ -.perlcriticrc -.perltidyrc -Changes -examples/indent.pl -examples/subtest.t -lib/Test/Builder.pm -lib/Test/Builder/Module.pm -lib/Test/Builder/Tester.pm -lib/Test/Builder/Tester/Color.pm -lib/Test/More.pm -lib/Test/Simple.pm -lib/Test/Tutorial.pod -Makefile.PL -MANIFEST This list of files -MANIFEST.SKIP -README -t/00compile.t -t/00test_harness_check.t -t/bad_plan.t -t/bail_out.t -t/BEGIN_require_ok.t -t/BEGIN_use_ok.t -t/buffer.t -t/Builder/Builder.t -t/Builder/carp.t -t/Builder/create.t -t/Builder/current_test.t -t/Builder/current_test_without_plan.t -t/Builder/details.t -t/Builder/done_testing.t -t/Builder/done_testing_double.t -t/Builder/done_testing_plan_mismatch.t -t/Builder/done_testing_with_no_plan.t -t/Builder/done_testing_with_number.t -t/Builder/done_testing_with_plan.t -t/Builder/fork_with_new_stdout.t -t/Builder/has_plan.t -t/Builder/has_plan2.t -t/Builder/is_fh.t -t/Builder/is_passing.t -t/Builder/maybe_regex.t -t/Builder/no_diag.t -t/Builder/no_ending.t -t/Builder/no_header.t -t/Builder/no_plan_at_all.t -t/Builder/ok_obj.t -t/Builder/output.t -t/Builder/reset.t -t/Builder/reset_outputs.t -t/Builder/try.t -t/c_flag.t -t/circular_data.t -t/cmp_ok.t -t/dependents.t -t/diag.t -t/died.t -t/dont_overwrite_die_handler.t -t/eq_set.t -t/exit.t -t/explain.t -t/extra.t -t/extra_one.t -t/fail-like.t -t/fail-more.t -t/fail.t -t/fail_one.t -t/filehandles.t -t/fork.t -t/harness_active.t -t/import.t -t/is_deeply_dne_bug.t -t/is_deeply_fail.t -t/is_deeply_with_threads.t -t/lib/Dev/Null.pm -t/lib/Dummy.pm -t/lib/MyOverload.pm -t/lib/NoExporter.pm -t/lib/SigDie.pm -t/lib/Test/Builder/NoOutput.pm -t/lib/Test/Simple/Catch.pm -t/lib/Test/Simple/sample_tests/death.plx -t/lib/Test/Simple/sample_tests/death_in_eval.plx -t/lib/Test/Simple/sample_tests/death_with_handler.plx -t/lib/Test/Simple/sample_tests/exit.plx -t/lib/Test/Simple/sample_tests/extras.plx -t/lib/Test/Simple/sample_tests/five_fail.plx -t/lib/Test/Simple/sample_tests/last_minute_death.plx -t/lib/Test/Simple/sample_tests/one_fail.plx -t/lib/Test/Simple/sample_tests/pre_plan_death.plx -t/lib/Test/Simple/sample_tests/require.plx -t/lib/Test/Simple/sample_tests/success.plx -t/lib/Test/Simple/sample_tests/too_few.plx -t/lib/Test/Simple/sample_tests/too_few_fail.plx -t/lib/Test/Simple/sample_tests/two_fail.plx -t/lib/TieOut.pm -t/missing.t -t/More.t -t/new_ok.t -t/no_plan.t -t/no_tests.t -t/note.t -t/overload.t -t/overload_threads.t -t/plan.t -t/plan_bad.t -t/plan_is_noplan.t -t/plan_no_plan.t -t/plan_shouldnt_import.t -t/plan_skip_all.t -t/pod-coverage.t -t/pod.t -t/require_ok.t -t/simple.t -t/skip.t -t/skipall.t -t/subtest/args.t -t/subtest/basic.t -t/subtest/die.t -t/subtest/do.t -t/subtest/exceptions.t -t/subtest/for_do_t.test -t/subtest/singleton.t -t/tbm_doesnt_set_exported_to.t -t/Tester/tbt_01basic.t -t/Tester/tbt_02fhrestore.t -t/Tester/tbt_03die.t -t/Tester/tbt_04line_num.t -t/Tester/tbt_05faildiag.t -t/Tester/tbt_06errormess.t -t/Tester/tbt_07args.t -t/thread_taint.t -t/threads.t -t/todo.t -t/undef.t -t/use_ok.t -t/useing.t -t/utf8.t -t/versions.t -TODO -META.yml Module meta-data (added by MakeMaker) -SIGNATURE Public-key signature (added by MakeMaker) diff --git a/cpan/Test-Simple/t/00compile.t b/cpan/Test-Simple/t/00compile.t deleted file mode 100644 index e282878..0000000 --- a/cpan/Test-Simple/t/00compile.t +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/perl -w - -BEGIN { - if( $ENV{PERL_CORE} ) { - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } -} -chdir 't'; - -use Test::More; - -my $Has_Test_Pod; -BEGIN { - $Has_Test_Pod = eval 'use Test::Pod 0.95; 1'; -} - -chdir ".."; -my $manifest = "MANIFEST"; -open(my $manifest_fh, "<", $manifest) or die "Can't open $manifest: $!"; -my @modules = map { m{^lib/(\S+)}; $1 } - grep { m{^lib/Test/\S*\.pm} } - grep { !m{/t/} } <$manifest_fh>; - -chomp @modules; -close $manifest_fh; - -chdir 'lib'; -plan tests => scalar @modules * 2; -foreach my $file (@modules) { - # Make sure we look at the local files and do not reload them if - # they're already loaded. This avoids recompilation warnings. - local @INC = @INC; - unshift @INC, "."; - ok eval { require($file); 1 } or diag "require $file failed.\n$@"; - - SKIP: { - skip "Test::Pod not installed", 1 unless $Has_Test_Pod; - pod_file_ok($file); - } -}