diff options
| -rwxr-xr-x | Porting/Maintainers.pl | 1 | ||||
| -rw-r--r-- | cpan/ExtUtils-MakeMaker/t/basic.t | 33 | ||||
| -rw-r--r-- | t/porting/customized.dat | 1 |
3 files changed, 20 insertions, 15 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 369b3f36b4..70516b2132 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -476,6 +476,7 @@ use File::Glob qw(:case); 'README.packaging', 'lib/ExtUtils/MakeMaker/version/vpp.pm', ], + 'CUSTOMIZED' => [ qw( t/basic.t ) ], }, 'ExtUtils::Manifest' => { diff --git a/cpan/ExtUtils-MakeMaker/t/basic.t b/cpan/ExtUtils-MakeMaker/t/basic.t index 3656c88fff..c98e28c653 100644 --- a/cpan/ExtUtils-MakeMaker/t/basic.t +++ b/cpan/ExtUtils-MakeMaker/t/basic.t @@ -66,8 +66,6 @@ my $Touch_Time = calibrate_mtime(); $| = 1; -delete @ENV{qw(PERL_CORE)}; - ok( setup_recurs(), 'setup' ); ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy" ) || @@ -266,21 +264,26 @@ SKIP: { rmtree('other'); } - -my $dist_test_out = run("$make disttest"); -is( $?, 0, 'disttest' ) || diag($dist_test_out); - -# Test META.yml generation -use ExtUtils::Manifest qw(maniread); - -my $distdir = 'Big-Dummy-0.01'; -$distdir =~ s/\./_/g if $Is_VMS; -my $meta_yml = "$distdir/META.yml"; -my $mymeta_yml = "$distdir/MYMETA.yml"; -my $meta_json = "$distdir/META.json"; -my $mymeta_json = "$distdir/MYMETA.json"; +my ($dist_test_out, $distdir, $meta_yml, $mymeta_yml, $meta_json, $mymeta_json); +SKIP: { + skip 'disttest depends on metafile, which is not run in core', 1 if $ENV{PERL_CORE}; + $dist_test_out = run("$make disttest"); + is( $?, 0, 'disttest' ) || diag($dist_test_out); + + # Test META.yml generation + use ExtUtils::Manifest qw(maniread); + + $distdir = 'Big-Dummy-0.01'; + $distdir =~ s/\./_/g if $Is_VMS; + $meta_yml = "$distdir/META.yml"; + $mymeta_yml = "$distdir/MYMETA.yml"; + $meta_json = "$distdir/META.json"; + $mymeta_json = "$distdir/MYMETA.json"; +} note "META file validity"; SKIP: { + skip 'disttest depends on metafile, which is not run in core', 104 if $ENV{PERL_CORE}; + eval { require CPAN::Meta; }; skip 'Loading CPAN::Meta failed', 104 if $@; diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 61013ebf5a..d5b9d664e5 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -1,6 +1,7 @@ CPAN cpan/CPAN/lib/CPAN.pm ce62c43d72f101c011184dbbc59e21c2790826f0 Encode cpan/Encode/encoding.pm 51c19efc9bfe8467d6ae12a4654f6e7f980715bf ExtUtils::Constant cpan/ExtUtils-Constant/t/Constant.t a0369c919e216fb02767a637666bb4577ad79b02 +ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/basic.t b7ee8691baf37197bf4249534f429fcf28f5cedf File::Path cpan/File-Path/lib/File/Path.pm fd8ce4420a0c113d3f47dd3223859743655c1da8 File::Path cpan/File-Path/t/Path_win32.t 94b9276557ce7f80b91f6fd9bfa7a0cd9bf9683e Math::BigRat cpan/Math-BigRat/lib/Math/BigRat.pm 6eabc68e04f67694f6fe523e64eb013fc337ca5b |