import perl 5.16.3 from CPAN - worked on by Andrew Fresh and myself

1 files changed, 9 insertions, 10 deletions

diff --git a/gnu/usr.bin/perl/cpan/Module-Build/t/script_dist.t b/gnu/usr.bin/perl/cpan/Module-Build/t/script_dist.t
index 7fd82d9547a..fa02b49d33f 100755
--- a/gnu/usr.bin/perl/cpan/Module-Build/t/script_dist.t
+++ b/gnu/usr.bin/perl/cpan/Module-Build/t/script_dist.t
@@ -7,6 +7,7 @@ use lib 't/lib';
 use MBTest 'no_plan';
 
 use DistGen qw(undent);
+use CPAN::Meta::YAML;
 
 blib_load('Module::Build');
 blib_load('Module::Build::ConfigData');
@@ -39,7 +40,7 @@ my %details = (
   dist_version => '0.01',
 );
 my %meta_provides = (
-  'bin-foo' => {
+  'foo' => {
     file => 'bin/foo',
     version => '0.01',
   }
@@ -68,13 +69,11 @@ is($mb->dist_name, 'bin-foo');
 is($mb->dist_version, '0.01');
 is_deeply($mb->dist_author,
   ['A. U. Thor, a.u.thor@a.galaxy.far.far.away']);
-ok $mb->dispatch('distmeta');
-
-SKIP: {
-  skip( 'YAML_support feature is not enabled', 1 )
-      unless Module::Build::ConfigData->feature('YAML_support');
-  require YAML::Tiny;
-  my $yml = YAML::Tiny::LoadFile('META.yml');
-  is_deeply($yml->{provides}, \%meta_provides);
-}
+my $result;
+stdout_stderr_of( sub { $result = $mb->dispatch('distmeta') } );
+ok $result;
+
+my $yml = CPAN::Meta::YAML->read_string(slurp('META.yml'))->[0];
+is_deeply($yml->{provides}, \%meta_provides);
+
 $dist->chdir_original if $dist->did_chdir;