diff options
| author | Craig A. Berry <craigberry@mac.com> | 2016-06-02 07:18:20 -0500 |
|---|---|---|
| committer | Craig A. Berry <craigberry@mac.com> | 2016-06-02 07:56:15 -0500 |
| commit | 3ecb55dd84519230479575c3898a0895dd4ba286 (patch) | |
| tree | 69c5c03097a3a28e7514c36747cf4d54f4af612c /cpan | |
| parent | ad1bab996deb0d22bb36939fb1f256d22ccd68cb (diff) | |
| download | perl-3ecb55dd84519230479575c3898a0895dd4ba286.tar.gz | |
Get EUMM basic.t passing again on Win32.
There are dueling uses of PERL_CORE. On Windows, the FIXIN macro
assumes it can run pl2bat.bat from the installed Perl if PERL_CORE
is not set, so deleting PERL_CORE from the environment as this
test was doing makes you get the wrong one (or none at all).
But if PERL_CORE is set, the metafile target is not generated in
the Makefile, so you can't test that or things that depend on it
(e.g. disttest). So at least for now, get basic.t passing by
skipping those tests.
Diffstat (limited to 'cpan')
| -rw-r--r-- | cpan/ExtUtils-MakeMaker/t/basic.t | 33 |
1 files changed, 18 insertions, 15 deletions
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 $@; |