In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/0fcb6a367491789c4ba3a99744c5373751a9aa56?hp=9b6b7be8acad62650aa5c229e89fad6706c8a0b0>
- Log ----------------------------------------------------------------- commit 0fcb6a367491789c4ba3a99744c5373751a9aa56 Author: Chris 'BinGOs' Williams <[email protected]> Date: Fri Jan 9 22:21:58 2015 +0000 Removed TODO from pm_to_lib test in EUMM And upstream fix for race condition applied https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/commit/6f41d63 ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 ++ cpan/ExtUtils-MakeMaker/t/pm_to_blib.t | 7 +++---- t/porting/customized.dat | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index ae4fb08..4d93c3f 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -479,6 +479,8 @@ use File::Glob qw(:case); 'PATCHING', 'README.packaging', ], + # Applied upstream remove customisation when updating EUMM + 'CUSTOMIZED' => [ qw[ t/pm_to_blib.t ] ], }, 'ExtUtils::Manifest' => { diff --git a/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t b/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t index d82fe6a..d83144b 100644 --- a/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t +++ b/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t @@ -68,13 +68,12 @@ local $ENV{PERL_INSTALL_QUIET}; # Rerun the Makefile.PL, pm_to_blib should rerun { + sleep 2; run_ok(qq{$perl Makefile.PL}); # XXX This is a fragile way to check that it reran. - TODO: { - local $TODO = 'This one is fragile on some systems for some reason that needs investigation'; - like run_ok($make), qr/^Skip /ms; - } + local $TODO = 'This one is fragile on some systems for some reason that needs investigation'; + like run_ok($make), qr/^Skip /ms; ok( -e "blib/lib/Big/Dummy.pm", "blib copied pm file" ); } diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 0c1e483..a91362a 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -1,5 +1,6 @@ Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf Encode cpan/Encode/encoding.pm 506ec84f1fbbff189c3f4f47b92aff5afc95b98e +ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 0637e6ef934adaf80249d2b57c35649279d8fce2 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691 Test::Simple cpan/Test-Simple/t/Legacy/exit.t 83edbf569d56d8cdbabea552dfe5602ea1c1822e Text::Balanced cpan/Text-Balanced/t/01_compile.t 1598cf491a48fa546260a2ec41142abe84da533d -- Perl5 Master Repository
