Removed TODO from pm_to_lib test in EUMM
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>
Fri, 9 Jan 2015 22:21:58 +0000 (22:21 +0000)
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>
Fri, 9 Jan 2015 22:33:18 +0000 (22:33 +0000)
And upstream fix for race condition applied

https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/commit/6f41d63

Porting/Maintainers.pl
cpan/ExtUtils-MakeMaker/t/pm_to_blib.t
t/porting/customized.dat

index ae4fb08..4d93c3f 100755 (executable)
@@ -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' => {
index d82fe6a..d83144b 100644 (file)
@@ -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" );
 }
index 0c1e483..a91362a 100644 (file)
@@ -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