From 5c903867518ee6e8d5d2baba54789912053e0e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> Date: Tue, 4 Oct 2016 17:00:58 +0200 Subject: Fix a test failing with underscored Cwd version
--- ...ix-RT-116479-test-failure-with-v5.24.1-RC.patch | 93 ++++++++++++++++++++++ perl-CPANPLUS.spec | 12 +++ 2 files changed, 105 insertions(+) create mode 100644 CPANPLUS-0.9160-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch diff --git a/CPANPLUS-0.9160-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch b/CPANPLUS-0.9160-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch new file mode 100644 index 0000000..d5dcfa4 --- /dev/null +++ b/CPANPLUS-0.9160-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch @@ -0,0 +1,93 @@ +From fe39e473a39e00b0bc9448f0c77333bd7fa1a7c0 Mon Sep 17 00:00:00 2001 +From: Chris 'BinGOs' Williams <[email protected]> +Date: Wed, 27 Jul 2016 20:10:44 +0100 +Subject: [PATCH] Fix RT#116479 test failure with v5.24.1-RC* +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Cwd in recently released perls is using tr/_// on $VERSION +which causes our test to fail. + +Fix: don't rely on things outside our control in the test + +Blame rjbs ultimately. + +Signed-off-by: Petr Písař <[email protected]> +--- + MANIFEST | 1 + + t/40_CPANPLUS-Internals-Report.t | 6 +++--- + t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz | Bin 0 -> 119 bytes + t/dummy-CPAN/modules/02packages.details.txt.gz | Bin 437 -> 451 bytes + 4 files changed, 4 insertions(+), 3 deletions(-) + create mode 100644 t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz + +diff --git a/MANIFEST b/MANIFEST +index a83b96a..cba6eaa 100644 +--- a/MANIFEST ++++ b/MANIFEST +@@ -134,6 +134,7 @@ t/40_CPANPLUS-Internals-Report.t + t/dummy-CPAN/authors/01mailrc.txt.gz + t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz + t/dummy-CPAN/authors/id/EUNOXS/CHECKSUMS ++t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz + t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.meta + t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.readme + t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz +diff --git a/t/40_CPANPLUS-Internals-Report.t b/t/40_CPANPLUS-Internals-Report.t +index a882335..6a5fc8d 100644 +--- a/t/40_CPANPLUS-Internals-Report.t ++++ b/t/40_CPANPLUS-Internals-Report.t +@@ -310,9 +310,9 @@ my $map = { + my $str = REPORT_TOOLCHAIN_VERSIONS->( $clone ); + + like($str, qr/toolchain/, "Correct message in report" ); +- use Cwd; +- like($str, qr/Cwd\s+\Q$Cwd::VERSION\E/, +- "Cwd has correct version in report" ); ++ use CPANPLUS; ++ like($str, qr/CPANPLUS\s+\Q$CPANPLUS::VERSION\E/, ++ "CPANPLUS has correct version in report" ); + } + } + +diff --git a/t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz b/t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz +new file mode 100644 +index 0000000000000000000000000000000000000000..1d1e081ad650eb8481265ce4233f0c9d3c7a8930 +GIT binary patch +literal 119 +zcmb2|=3pp!ve%V?`R#c_t_A}hhl?^x)hBE*`)cv%!IF-Uz5A88cD=arcK=iUlM~L= +z%B>CB8kVi;!moL3v+t&G{YO{VtPK8O*zqgD@o47C=6Tyv-)<^4Dhd9-^}G3g`JLPh +R$iTtT+H``gGlK>L0|4xAF{uCm + +literal 0 +HcmV?d00001 + +diff --git a/t/dummy-CPAN/modules/02packages.details.txt.gz b/t/dummy-CPAN/modules/02packages.details.txt.gz +index ec0f69d8cb3e181a031704287fc48f73a27bceee..f52ed6b413e97690df76d2f764472523043309df 100644 +GIT binary patch +literal 451 +zcmV;!0X+U6iwFoe1({a>128ghVPk7yXJvCPWMy<=X>4;Yba-?Cozq`$(=ZSK@b`R* +zd*A`2#_>{B2tU!376I+3DAD$Yy!h5yBz9z97P?Q5z3y)zz&J&U<eY!LOL7Zcqky~M +zc`K{$a*LiRB&lo9=m#a`m*qna?1);CWqseX7G2FM+hnu#^fYU%>T2}afbtG~<#bEh +znxL%@DPUxS9xiQX6leoVJFLjMJ-oOvWk);fe5O^F%xv8?#^09GJ_1H?h0X_f6qae1 +zd@zJYp-LCl37B?d8%e0(5~<pOvmI%JesnlIKnTiKU4w>XERQ8;PE#P#VjoXyYNb8( +zGH!l(1vwk@{1sg6VQQ2^>DecXMsMFrqZ=7|PL_dBXQ3yG+fUvkOX(>sTNSGiaE59G +zV-6psft>Rk_(bI4dJXSaUz22Etq_HDLd;7c&Npxrobi)*pO@#GEF`BPH;s#oq+{Fb +zN5HE16R;}&2{`?HOgsSb*<Xm*#4s^0pFs$*=`Q|<IDP}qAd2v3h8Yn<)Ddw=Pk$%P +tdNowXP2^9dI9wCP`Q#fP-xFab*30sjFFH`nUHX$UlAod*sN?hl008l+(0Kp= + +literal 437 +zcmV;m0ZRTKiwFoea572&128ghVPk7yXJvCPWMy<=X>4;Yba-?Cozqco(=ZSK;CKIu +zd*A`2#_>{BOn#y%EdttYqD0%<<i)qvBC#X;vQU0K_R6$TQD8e+ie#TZ-&yg(G$`RA +zMA51Go7!OD8cCTZaQaTH`m%h?fh|!d^L!Wv-l1=J?b>{HF+Iy$r~3v&enfeXq4uUD +z<80I}_9<Xhivez3Z#5VT+IXzV`5nBvH&stt=R<CE&StLZTN{3r(mer2aECrbcoe5; +z%RX8{t5IhQ=Os*ga;+lNaEnxL!MmP}#W30*9w7wn>b^xwDwW6Cr8g9btlXv3+D4l| +zgG!rU-$B90qId&0JD6JSQ3d|lp*5R#%9>Wip4l?;*(~-%Y5U13TdF`=)#+4)giF*T +z7z_BMEEGZ%ASSYi<1KtxePwLnoRp>VQqC(Wuhwu7f{T;%omW@uJSJx`H%pV8l;@it +zPk>eVH(*u%7jSldNIU{*?H@#H;y5v{o<T^t?r&Z~9Nxe)h%)|}@r}r1)B&+i&;BIM +f27RoK`zU^w(&L(NAtu*i{6Mguaee}9umb=9u36EE + +-- +2.7.4 + diff --git a/perl-CPANPLUS.spec b/perl-CPANPLUS.spec index dd3d4fa..f3496c8 100644 --- a/perl-CPANPLUS.spec +++ b/perl-CPANPLUS.spec @@ -10,6 +10,11 @@ URL: http://search.cpan.org/dist/CPANPLUS/ Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/CPANPLUS-%{cpan_version}.tar.gz # Correct a typo in cpan2dist manual, in upstream after 0.9160 Patch0: CPANPLUS-0.9160-Spelling-fix.patch +# Fix a test failing with underscored Cwd version, CPAN RT#116479, +# in upstream after 0.9160 +# XXX: This is a git binary diff, use git for applying it +BuildRequires: git-core +Patch1: CPANPLUS-0.9160-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: findutils @@ -97,6 +102,12 @@ interactive shells, command line programs, etc., that use this API. %prep %setup -q -n CPANPLUS-%{cpan_version} %patch0 -p1 +git init-db +git add . +git config user.email "[email protected]" +git config user.name "Your Name" +git commit -a -m 'import' +git am <%{PATCH1} # Remove bundled modules %if !%{defined perl_bootstrap} rm -rf inc @@ -130,6 +141,7 @@ make test %{?_smp_mflags} %changelog * Tue Oct 04 2016 Petr Pisar <[email protected]> - 0.91.60-2 - Correct a typo in cpan2dist manual +- Fix a test failing with underscored Cwd version (CPAN RT#116479) * Fri May 20 2016 Petr Pisar <[email protected]> - 0.91.60-1 - 0.9160 bump -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/perl-CPANPLUS.git/commit/?h=f23&id=5c903867518ee6e8d5d2baba54789912053e0e56 _______________________________________________ perl-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
