Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | Some Perl tests fail when run on a cross-compiled target machine. Apply |
| 2 | a slightly tweaked upstream patch to fix the problems. Notes: |
| 3 | 1. as of 2 Jun 2016, the original patch has been applied to the current |
| 4 | EUMM releases, but has not made it into perl core yet. |
| 5 | 2. when the base perl package is upgraded in Yocto, this patch may need |
| 6 | to be replaced by the original upstream version to correctly apply |
| 7 | to the current version of ExtUtils-MakeMaker at that time. |
| 8 | |
| 9 | [YOCTO #8656] |
| 10 | |
| 11 | Upstream-Status: Backport |
| 12 | |
| 13 | Signed-off-by: Bill Randle <william.c.randle@intel.com> |
| 14 | |
| 15 | From 4a07a3bd18363986112cf2b39dec3c2985353ffb Mon Sep 17 00:00:00 2001 |
| 16 | From: Francois Perrad <francois.perrad@gadz.org> |
| 17 | Date: Mon, 22 Dec 2014 19:04:34 +0100 |
| 18 | Subject: [PATCH] fix conflict between skip_all and END section |
| 19 | |
| 20 | since the commit 430de781809a6be3bcd25a349dc40ce54405ab53 |
| 21 | the test suite fails in cross-compil environment (perl-5.21.6 & perl-5.21.7) |
| 22 | like this : |
| 23 | |
| 24 | $ ./perl harness -v ../cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t |
| 25 | ../cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t .. |
| 26 | 1..0 # SKIP cross-compiling and make not available |
| 27 | ok 1 - chdir updir |
| 28 | ok 2 - teardown |
| 29 | # Looks like you planned 0 tests but ran 2. |
| 30 | skipped: cross-compiling and make not available |
| 31 | |
| 32 | this commit restores the implicit call of plan() at import time of Test::More |
| 33 | |
| 34 | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> |
| 35 | --- |
| 36 | cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t | 7 ++++--- |
| 37 | cpan/ExtUtils-MakeMaker/t/PL_FILES.t | 4 ++-- |
| 38 | cpan/ExtUtils-MakeMaker/t/basic.t | 4 ++-- |
| 39 | cpan/ExtUtils-MakeMaker/t/echo.t | 6 +++--- |
| 40 | cpan/ExtUtils-MakeMaker/t/min_perl_version.t | 4 ++-- |
| 41 | cpan/ExtUtils-MakeMaker/t/pm_to_blib.t | 4 ++-- |
| 42 | cpan/ExtUtils-MakeMaker/t/recurs.t | 4 ++-- |
| 43 | cpan/ExtUtils-MakeMaker/t/several_authors.t | 4 ++-- |
| 44 | 8 files changed, 19 insertions(+), 18 deletions(-) |
| 45 | |
| 46 | diff --git a/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t b/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t |
| 47 | index f27b62c..3bbb3a6 100644 |
| 48 | --- a/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t |
| 49 | +++ b/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t |
| 50 | @@ -15,12 +15,13 @@ $CLEANUP &&= 1; # so always 1 or numerically 0 |
| 51 | |
| 52 | use MakeMaker::Test::Utils; |
| 53 | use MakeMaker::Test::Setup::BFD; |
| 54 | -use Test::More; |
| 55 | use Config; |
| 56 | use ExtUtils::MM; |
| 57 | -plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 58 | +use Test::More |
| 59 | + !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 60 | ? (skip_all => "cross-compiling and make not available") |
| 61 | - : (tests => 3 + $CLEANUP + @INSTDIRS * (15 + $CLEANUP)); |
| 62 | + : (); |
| 63 | +plan tests => 3 + $CLEANUP + @INSTDIRS * (15 + $CLEANUP); |
| 64 | |
| 65 | my $Is_VMS = $^O eq 'VMS'; |
| 66 | |
| 67 | diff --git a/cpan/ExtUtils-MakeMaker/t/PL_FILES.t b/cpan/ExtUtils-MakeMaker/t/PL_FILES.t |
| 68 | index 0779dbb..85d53a5 100644 |
| 69 | --- a/cpan/ExtUtils-MakeMaker/t/PL_FILES.t |
| 70 | +++ b/cpan/ExtUtils-MakeMaker/t/PL_FILES.t |
| 71 | @@ -11,9 +11,9 @@ use File::Temp qw[tempdir]; |
| 72 | use MakeMaker::Test::Setup::PL_FILES; |
| 73 | use MakeMaker::Test::Utils; |
| 74 | use Config; |
| 75 | -use Test::More; |
| 76 | use ExtUtils::MM; |
| 77 | -plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 78 | +use Test::More |
| 79 | + !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 80 | ? (skip_all => "cross-compiling and make not available") |
| 81 | : (tests => 9); |
| 82 | |
| 83 | diff --git a/cpan/ExtUtils-MakeMaker/t/basic.t b/cpan/ExtUtils-MakeMaker/t/basic.t |
| 84 | index 3dd66ad..eddf2e9 100644 |
| 85 | --- a/cpan/ExtUtils-MakeMaker/t/basic.t |
| 86 | +++ b/cpan/ExtUtils-MakeMaker/t/basic.t |
| 87 | @@ -20,9 +20,9 @@ use utf8; |
| 88 | use MakeMaker::Test::Utils; |
| 89 | use MakeMaker::Test::Setup::BFD; |
| 90 | use Config; |
| 91 | -use Test::More; |
| 92 | use ExtUtils::MM; |
| 93 | -plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 94 | +use Test::More |
| 95 | + !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 96 | ? (skip_all => "cross-compiling and make not available") |
| 97 | : (tests => 171); |
| 98 | use File::Find; |
| 99 | diff --git a/cpan/ExtUtils-MakeMaker/t/echo.t b/cpan/ExtUtils-MakeMaker/t/echo.t |
| 100 | index 789b85f..c43bc47 100644 |
| 101 | --- a/cpan/ExtUtils-MakeMaker/t/echo.t |
| 102 | +++ b/cpan/ExtUtils-MakeMaker/t/echo.t |
| 103 | @@ -14,11 +14,11 @@ use MakeMaker::Test::Utils; |
| 104 | use File::Temp; |
| 105 | use Cwd 'abs_path'; |
| 106 | |
| 107 | -use Test::More; |
| 108 | use ExtUtils::MM; |
| 109 | -plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 110 | +use Test::More |
| 111 | + !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 112 | ? (skip_all => "cross-compiling and make not available") |
| 113 | - : (); |
| 114 | + : (tests => 18); |
| 115 | |
| 116 | #--------------------- Setup |
| 117 | |
| 118 | diff --git a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t |
| 119 | index c5d78d6..2ef118d 100644 |
| 120 | --- a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t |
| 121 | +++ b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t |
| 122 | @@ -13,9 +13,9 @@ use TieOut; |
| 123 | use MakeMaker::Test::Utils; |
| 124 | use MakeMaker::Test::Setup::MPV; |
| 125 | use Config; |
| 126 | -use Test::More; |
| 127 | use ExtUtils::MM; |
| 128 | -plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 129 | +use Test::More |
| 130 | + !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 131 | ? (skip_all => "cross-compiling and make not available") |
| 132 | : (tests => 36); |
| 133 | use File::Path; |
| 134 | diff --git a/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t b/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t |
| 135 | index f1e348e..ebfa26c 100644 |
| 136 | --- a/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t |
| 137 | +++ b/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t |
| 138 | @@ -12,9 +12,9 @@ use ExtUtils::MakeMaker; |
| 139 | use MakeMaker::Test::Utils; |
| 140 | use MakeMaker::Test::Setup::BFD; |
| 141 | use Config; |
| 142 | -use Test::More; |
| 143 | use ExtUtils::MM; |
| 144 | -plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 145 | +use Test::More |
| 146 | + !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 147 | ? (skip_all => "cross-compiling and make not available") |
| 148 | : 'no_plan'; |
| 149 | |
| 150 | diff --git a/cpan/ExtUtils-MakeMaker/t/recurs.t b/cpan/ExtUtils-MakeMaker/t/recurs.t |
| 151 | index 84c09a2..661e0db 100644 |
| 152 | --- a/cpan/ExtUtils-MakeMaker/t/recurs.t |
| 153 | +++ b/cpan/ExtUtils-MakeMaker/t/recurs.t |
| 154 | @@ -14,9 +14,9 @@ use File::Temp qw[tempdir]; |
| 155 | use MakeMaker::Test::Utils; |
| 156 | use MakeMaker::Test::Setup::Recurs; |
| 157 | use Config; |
| 158 | -use Test::More; |
| 159 | use ExtUtils::MM; |
| 160 | -plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 161 | +use Test::More |
| 162 | + !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 163 | ? (skip_all => "cross-compiling and make not available") |
| 164 | : (tests => 26); |
| 165 | |
| 166 | diff --git a/cpan/ExtUtils-MakeMaker/t/several_authors.t b/cpan/ExtUtils-MakeMaker/t/several_authors.t |
| 167 | index 1a75a3e..869e9f0 100644 |
| 168 | --- a/cpan/ExtUtils-MakeMaker/t/several_authors.t |
| 169 | +++ b/cpan/ExtUtils-MakeMaker/t/several_authors.t |
| 170 | @@ -13,9 +13,9 @@ use TieOut; |
| 171 | use MakeMaker::Test::Utils; |
| 172 | use MakeMaker::Test::Setup::SAS; |
| 173 | use Config; |
| 174 | -use Test::More; |
| 175 | use ExtUtils::MM; |
| 176 | -plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 177 | +use Test::More |
| 178 | + !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} |
| 179 | ? (skip_all => "cross-compiling and make not available") |
| 180 | : (tests => 20); |
| 181 | use File::Path; |